Split additional joins into multiple lines

diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
index e04bb9017bcfd342ca838a50ca2ae3c726c3f979..db671baa14d9facc08860b13e22ec65de87671c6 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
@@ -270,7 +270,9 @@ class UserSearchForm extends UserOptionListForm
     protected function search()
     {
         $this->userList = new UserList();
-        $this->userList->sqlConditionJoins .= " LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID";
+        $this->userList->sqlConditionJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+            ON          user_option_value.userID = user_table.userID";
         $this->userList->sqlLimit = $this->maxResults;
 
         EventHandler::getInstance()->fireAction($this, 'search');

diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
index 68f2edd2d24f9f351d1f968a8b9e909ac8631b28..bdc23ba4034a6a4e436fd0fabe1c48d762399f1b 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
@@ -93,7 +93,9 @@ class CronjobLogListPage extends SortablePage
         parent::initObjectList();
 
         $this->objectList->sqlSelects = "cronjob.*";
-        $this->objectList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_cronjob cronjob ON cronjob.cronjobID = cronjob_log.cronjobID";
+        $this->objectList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_cronjob cronjob
+            ON          cronjob.cronjobID = cronjob_log.cronjobID";
 
         if ($this->cronjobID) {
             $this->objectList->getConditionBuilder()->add('cronjob_log.cronjobID = ?', [$this->cronjobID]);

diff --git a/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php b/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php
index a50f0af19193c6d723114ee2c8f7a8dc35c648f8..78d0c522c9570c3a96f7473040ec0af76f1c4577 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php
@@ -110,7 +110,9 @@ class LabelListPage extends SortablePage
         parent::initObjectList();
 
         $this->objectList->sqlSelects = "label_group.groupName, label_group.groupDescription";
-        $this->objectList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_label_group label_group ON label_group.groupID = label.groupID";
+        $this->objectList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_label_group label_group
+            ON          label_group.groupID = label.groupID";
         if ($this->labelGroup) {
             $this->objectList->getConditionBuilder()->add('label.groupID = ?', [$this->labelGroup->groupID]);
 

diff --git a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
index 52e3001cf82c2bc99961dcebdfffbe465ffe9cec..e04687ae5c4cadb8e75486c0464d73527497280b 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
@@ -131,8 +131,11 @@ class PaidSubscriptionTransactionLogListPage extends SortablePage
         }
 
         $this->objectList->sqlSelects = 'user_table.username, paid_subscription.title';
-        $this->objectList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = paid_subscription_transaction_log.userID";
-        $this->objectList->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_paid_subscription paid_subscription ON paid_subscription.subscriptionID = paid_subscription_transaction_log.subscriptionID";
+        $this->objectList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = paid_subscription_transaction_log.userID
+            LEFT JOIN   wcf" . WCF_N . "_paid_subscription paid_subscription
+            ON          paid_subscription.subscriptionID = paid_subscription_transaction_log.subscriptionID";
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionUserListPage.class.php b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionUserListPage.class.php
index d60b5a29aa9781323b6f9846b7986e43f50d24e4..66c1516f7466dfe767bf1be1d47c2b2d4271bd98 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionUserListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionUserListPage.class.php
@@ -103,8 +103,11 @@ class PaidSubscriptionUserListPage extends SortablePage
 
         $this->objectList->getConditionBuilder()->add('paid_subscription_user.isActive = ?', [1]);
         $this->objectList->sqlSelects = 'user_table.username, paid_subscription.title';
-        $this->objectList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = paid_subscription_user.userID";
-        $this->objectList->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_paid_subscription paid_subscription ON paid_subscription.subscriptionID = paid_subscription_user.subscriptionID";
+        $this->objectList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = paid_subscription_user.userID
+            LEFT JOIN   wcf" . WCF_N . "_paid_subscription paid_subscription
+            ON          paid_subscription.subscriptionID = paid_subscription_user.subscriptionID";
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/acp/page/TagListPage.class.php b/wcfsetup/install/files/lib/acp/page/TagListPage.class.php
index f5b9532154bb7bd938eee256174f9ad264b1fbed..8cd6e700a75b69a37260742622dd2442313aa698 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/TagListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/TagListPage.class.php
@@ -96,8 +96,11 @@ class TagListPage extends SortablePage
         $this->objectList->sqlSelects .= ", language.languageName, language.languageCode";
         $this->objectList->sqlSelects .= ", synonym.name AS synonymName";
 
-        $this->objectList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_language language ON tag.languageID = language.languageID";
-        $this->objectList->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_tag synonym ON tag.synonymFor = synonym.tagID";
+        $this->objectList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_language language
+            ON          tag.languageID = language.languageID
+            LEFT JOIN   wcf" . WCF_N . "_tag synonym
+            ON          tag.synonymFor = synonym.tagID";
 
         if ($this->search !== '') {
             $this->objectList->getConditionBuilder()->add('tag.name LIKE ?', [$this->search . '%']);

diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
index d625a148c449d71bb8675608c898644e8f62000d..0592ee48923a0f2a27aa79c3d14ef96dad39ebad 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
@@ -260,7 +260,10 @@ class UserListPage extends SortablePage
         // get user ids
         $sql = "SELECT      user_table.userID
                 FROM        wcf" . WCF_N . "_user user_table
-                " . (isset($this->options[$this->sortField]) ? "LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID" : '') . "
+                " . (isset($this->options[$this->sortField]) ? "
+                    LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+                    ON          user_option_value.userID = user_table.userID
+                    " : '') . "
                 " . $this->conditions . "
                 ORDER BY    " . (($this->sortField != 'email' && isset($this->options[$this->sortField])) ? 'user_option_value.userOption' . $this->options[$this->sortField]->optionID : $this->sortField) . " " . $this->sortOrder;
         $statement = WCF::getDB()->prepareStatement(

diff --git a/wcfsetup/install/files/lib/acp/page/UserRankListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserRankListPage.class.php
index a6476722cccf4b70b3506025c5fe09a2065363fe..b4d081d6f6bcada8bdc6fb8bff634225c6fb9d22 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/UserRankListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UserRankListPage.class.php
@@ -55,6 +55,8 @@ class UserRankListPage extends SortablePage
         parent::initObjectList();
 
         $this->objectList->sqlSelects = 'user_group.groupName';
-        $this->objectList->sqlJoins = 'LEFT JOIN wcf' . WCF_N . '_user_group user_group ON user_group.groupID = user_rank.groupID';
+        $this->objectList->sqlJoins = '
+            LEFT JOIN   wcf' . WCF_N . '_user_group user_group
+            ON          user_group.groupID = user_rank.groupID';
     }
 }

diff --git a/wcfsetup/install/files/lib/data/article/ViewableArticleList.class.php b/wcfsetup/install/files/lib/data/article/ViewableArticleList.class.php
index 58daaabc4595af00c6d8179f73855441cd2628fc..21986ea38d814ea90fd651c9e6f8804606c56ef4 100644 (file)
--- a/wcfsetup/install/files/lib/data/article/ViewableArticleList.class.php
+++ b/wcfsetup/install/files/lib/data/article/ViewableArticleList.class.php
@@ -49,14 +49,21 @@ class ViewableArticleList extends ArticleList
                 $this->sqlSelects .= ',';
             }
             $this->sqlSelects .= 'tracked_visit.visitTime';
-            $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_tracked_visit tracked_visit ON tracked_visit.objectTypeID = " . VisitTracker::getInstance()->getObjectTypeID('com.woltlab.wcf.article') . " AND tracked_visit.objectID = article.articleID AND tracked_visit.userID = " . WCF::getUser()->userID;
+            $this->sqlJoins .= "
+                LEFT JOIN   wcf" . WCF_N . "_tracked_visit tracked_visit
+                ON          tracked_visit.objectTypeID = " . VisitTracker::getInstance()->getObjectTypeID('com.woltlab.wcf.article') . "
+                        AND tracked_visit.objectID = article.articleID
+                        AND tracked_visit.userID = " . WCF::getUser()->userID;
         }
 
         if (!empty($this->sqlSelects)) {
             $this->sqlSelects .= ',';
         }
         $this->sqlSelects .= "like_object.cachedReactions";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_like_object like_object ON like_object.objectTypeID = " . ReactionHandler::getInstance()->getObjectType('com.woltlab.wcf.likeableArticle')->objectTypeID . " AND like_object.objectID = article.articleID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_like_object like_object
+            ON          like_object.objectTypeID = " . ReactionHandler::getInstance()->getObjectType('com.woltlab.wcf.likeableArticle')->objectTypeID . "
+                    AND like_object.objectID = article.articleID";
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/data/attachment/AdministrativeAttachmentList.class.php b/wcfsetup/install/files/lib/data/attachment/AdministrativeAttachmentList.class.php
index 345ddd95401253652c2e2f62ad2ba2d0fdddf24d..007b1fa2244230eaa03480ebedd5c099e0269473 100644 (file)
--- a/wcfsetup/install/files/lib/data/attachment/AdministrativeAttachmentList.class.php
+++ b/wcfsetup/install/files/lib/data/attachment/AdministrativeAttachmentList.class.php
@@ -33,7 +33,9 @@ class AdministrativeAttachmentList extends AttachmentList
         parent::__construct();
 
         $this->sqlSelects = 'user_table.username';
-        $this->sqlJoins = " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = attachment.userID";
+        $this->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = attachment.userID";
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/data/media/MediaList.class.php b/wcfsetup/install/files/lib/data/media/MediaList.class.php
index e193ee7e80cf5a9f8b3307de564018e17e315381..2b9f9167d90d56e100b17f2278dc7c49b5643cb1 100644 (file)
--- a/wcfsetup/install/files/lib/data/media/MediaList.class.php
+++ b/wcfsetup/install/files/lib/data/media/MediaList.class.php
@@ -39,7 +39,9 @@ class MediaList extends DatabaseObjectList
 
         $searchString = '%' . \addcslashes($searchString, '_%') . '%';
 
-        $this->sqlConditionJoins .= ' LEFT JOIN wcf' . WCF_N . '_media_content media_content ON media_content.mediaID = media.mediaID';
+        $this->sqlConditionJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_media_content media_content
+            ON          media_content.mediaID = media.mediaID';
 
         $conditionBuilder = new PreparedStatementConditionBuilder(false, 'OR');
         $conditionBuilder->add('media_content.title LIKE ?', [$searchString]);

diff --git a/wcfsetup/install/files/lib/data/media/ViewableMediaList.class.php b/wcfsetup/install/files/lib/data/media/ViewableMediaList.class.php
index aff03d87eea48e97dbf079b6f4c4216a340b694d..cdbef0c7891a7e58c326475f7690645ceb574f29 100644 (file)
--- a/wcfsetup/install/files/lib/data/media/ViewableMediaList.class.php
+++ b/wcfsetup/install/files/lib/data/media/ViewableMediaList.class.php
@@ -40,6 +40,9 @@ class ViewableMediaList extends MediaList
 
         // fetch content data
         $this->sqlSelects .= "media_content.*, COALESCE(media.languageID, " . $languageID . ") AS localizedLanguageID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_media_content media_content ON media_content.mediaID = media.mediaID AND media_content.languageID = COALESCE(media.languageID, " . $languageID . ")";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_media_content media_content
+            ON          media_content.mediaID = media.mediaID
+                    AND media_content.languageID = COALESCE(media.languageID, " . $languageID . ")";
     }
 }

diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueueList.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueueList.class.php
index 03d85e0a39c8751fcf3d94209807bb917946e0c7..f58513c36a5f48668f0513eb833fc2ea527cd202 100644 (file)
--- a/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueueList.class.php
+++ b/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueueList.class.php
@@ -45,8 +45,11 @@ class ViewableModerationQueueList extends ModerationQueueList
         $this->sqlSelects = "moderation_queue.*, assigned_user.username AS assignedUsername, user_table.username";
         $this->sqlConditionJoins = ", wcf" . WCF_N . "_moderation_queue moderation_queue";
         $this->sqlJoins = ", wcf" . WCF_N . "_moderation_queue moderation_queue";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user assigned_user ON assigned_user.userID = moderation_queue.assignedUserID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = moderation_queue.userID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user assigned_user
+            ON          assigned_user.userID = moderation_queue.assignedUserID
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = moderation_queue.userID";
         $this->getConditionBuilder()->add("moderation_queue_to_user.queueID = moderation_queue.queueID");
         $this->getConditionBuilder()->add("moderation_queue_to_user.userID = ?", [WCF::getUser()->userID]);
         $this->getConditionBuilder()->add("moderation_queue_to_user.isAffected = ?", [1]);

diff --git a/wcfsetup/install/files/lib/data/template/TemplateList.class.php b/wcfsetup/install/files/lib/data/template/TemplateList.class.php
index ddbc9844435a5e3999e401297d1f459515c86b7e..37fa7156eb9d57e80c8cc67ce8770dd00c7fca58 100644 (file)
--- a/wcfsetup/install/files/lib/data/template/TemplateList.class.php
+++ b/wcfsetup/install/files/lib/data/template/TemplateList.class.php
@@ -34,8 +34,11 @@ class TemplateList extends DatabaseObjectList
         parent::__construct();
 
         $this->sqlSelects = 'package.package, template_group.templateGroupFolderName';
-        $this->sqlJoins = " LEFT JOIN wcf" . WCF_N . "_package package ON package.packageID = template.packageID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_template_group template_group ON template_group.templateGroupID = template.templateGroupID";
+        $this->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_package package
+            ON          package.packageID = template.packageID
+            LEFT JOIN   wcf" . WCF_N . "_template_group template_group
+            ON          template_group.templateGroupID = template.templateGroupID";
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/data/trophy/TrophyAction.class.php b/wcfsetup/install/files/lib/data/trophy/TrophyAction.class.php
index 7f15d0139f8efafc9d7acc5d1586f4b24d59ec36..27148b2a307e13ed98d82972e5d5049e632b6674 100644 (file)
--- a/wcfsetup/install/files/lib/data/trophy/TrophyAction.class.php
+++ b/wcfsetup/install/files/lib/data/trophy/TrophyAction.class.php
@@ -85,8 +85,11 @@ class TrophyAction extends AbstractDatabaseObjectAction implements IToggleAction
         if (!empty($userTrophyList->sqlJoins)) {
             $userTrophyList->sqlJoins .= ' ';
         }
-        $userTrophyList->sqlJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
-        $userTrophyList->sqlJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
+        $userTrophyList->sqlJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+            ON          user_trophy.trophyID = trophy.trophyID
+            LEFT JOIN   wcf' . WCF_N . '_category category
+            ON          trophy.categoryID = category.categoryID';
 
         $userTrophyList->getConditionBuilder()->add('trophy.isDisabled = ?', [0]);
         $userTrophyList->getConditionBuilder()->add('category.isDisabled = ?', [0]);

diff --git a/wcfsetup/install/files/lib/data/user/UserList.class.php b/wcfsetup/install/files/lib/data/user/UserList.class.php
index c4592a2286209d53819c2263970f90a70dc6054c..ea7ee1fcf6611d758f032ad0e8ef14b0956c3a45 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/UserList.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserList.class.php
@@ -35,6 +35,8 @@ class UserList extends DatabaseObjectList
             $this->sqlSelects .= ',';
         }
         $this->sqlSelects .= "user_option_value.*";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+            ON          user_option_value.userID = user_table.userID";
     }
 }

diff --git a/wcfsetup/install/files/lib/data/user/UserProfileList.class.php b/wcfsetup/install/files/lib/data/user/UserProfileList.class.php
index 142b9af914be8ce908a0e6af7f375518ce4be832..e72c5a68d038a659bb506129fb2700bda5932b68 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/UserProfileList.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserProfileList.class.php
@@ -38,16 +38,22 @@ class UserProfileList extends UserList
             $this->sqlSelects .= ',';
         }
         $this->sqlSelects .= "user_avatar.*";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_avatar user_avatar ON user_avatar.avatarID = user_table.avatarID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user_avatar user_avatar
+            ON          user_avatar.avatarID = user_table.avatarID";
 
         if (MODULE_USER_RANK) {
             $this->sqlSelects .= ",user_rank.*";
-            $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_rank user_rank ON user_rank.rankID = user_table.rankID";
+            $this->sqlJoins .= "
+                LEFT JOIN   wcf" . WCF_N . "_user_rank user_rank
+                ON          user_rank.rankID = user_table.rankID";
         }
 
         // get current location
         $this->sqlSelects .= ", session.pageID, session.pageObjectID, session.lastActivityTime AS sessionLastActivityTime";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_session session ON session.userID = user_table.userID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_session session
+            ON          session.userID = user_table.userID";
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/data/user/follow/UserFollowerList.class.php b/wcfsetup/install/files/lib/data/user/follow/UserFollowerList.class.php
index cee6bf39eadb231b7e7dc866857bb21cf9dfb2e0..f4281c7ecfaafa8120d8dbf16298b24e82a0d28f 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/follow/UserFollowerList.class.php
+++ b/wcfsetup/install/files/lib/data/user/follow/UserFollowerList.class.php
@@ -50,7 +50,10 @@ class UserFollowerList extends UserFollowList
         $this->sqlSelects .= "user_table.username, user_table.email, user_table.disableAvatar, user_table.enableGravatar, user_table.gravatarFileExtension";
         $this->sqlSelects .= ", user_avatar.*";
 
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = user_follow.userID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_avatar user_avatar ON user_avatar.avatarID = user_table.avatarID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = user_follow.userID
+            LEFT JOIN   wcf" . WCF_N . "_user_avatar user_avatar
+            ON          user_avatar.avatarID = user_table.avatarID";
     }
 }

diff --git a/wcfsetup/install/files/lib/data/user/follow/UserFollowingList.class.php b/wcfsetup/install/files/lib/data/user/follow/UserFollowingList.class.php
index fcd10a67e9af9a56ee533ba1a10a66e2372ae60b..593da80a6f8d5b5e8c7a1c473a3edd58d58fa916 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/follow/UserFollowingList.class.php
+++ b/wcfsetup/install/files/lib/data/user/follow/UserFollowingList.class.php
@@ -28,13 +28,19 @@ class UserFollowingList extends UserFollowerList
 
         $this->sqlSelects .= "user_avatar.*, user_follow.followID, user_option_value.*";
 
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = user_follow.followUserID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_avatar user_avatar ON user_avatar.avatarID = user_table.avatarID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = user_follow.followUserID
+            LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+            ON          user_option_value.userID = user_table.userID
+            LEFT JOIN   wcf" . WCF_N . "_user_avatar user_avatar
+            ON          user_avatar.avatarID = user_table.avatarID";
 
         if (MODULE_USER_RANK) {
             $this->sqlSelects .= ",user_rank.*";
-            $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_rank user_rank ON user_rank.rankID = user_table.rankID";
+            $this->sqlJoins .= "
+                LEFT JOIN   wcf" . WCF_N . "_user_rank user_rank
+                ON          user_rank.rankID = user_table.rankID";
         }
 
         $this->sqlSelects .= ", user_table.*";

diff --git a/wcfsetup/install/files/lib/data/user/ignore/ViewableUserIgnoreList.class.php b/wcfsetup/install/files/lib/data/user/ignore/ViewableUserIgnoreList.class.php
index c69608aae793c0f107f2167e12969faa36c6b6f9..f8d3098d8f61eae835e3999c273b8d6cb210e31d 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/ignore/ViewableUserIgnoreList.class.php
+++ b/wcfsetup/install/files/lib/data/user/ignore/ViewableUserIgnoreList.class.php
@@ -49,13 +49,19 @@ class ViewableUserIgnoreList extends UserIgnoreList
         $this->sqlSelects .= ", user_option_value.*";
         $this->sqlSelects .= ", user_avatar.*";
 
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = user_ignore.ignoreUserID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_avatar user_avatar ON user_avatar.avatarID = user_table.avatarID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = user_ignore.ignoreUserID
+            LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+            ON          user_option_value.userID = user_table.userID
+            LEFT JOIN   wcf" . WCF_N . "_user_avatar user_avatar
+            ON          user_avatar.avatarID = user_table.avatarID";
 
         if (MODULE_USER_RANK) {
             $this->sqlSelects .= ",user_rank.*";
-            $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_rank user_rank ON user_rank.rankID = user_table.rankID";
+            $this->sqlJoins .= "
+                LEFT JOIN   wcf" . WCF_N . "_user_rank user_rank
+                ON          user_rank.rankID = user_table.rankID";
         }
 
         $this->sqlSelects .= ", user_table.*";

diff --git a/wcfsetup/install/files/lib/data/user/notification/event/recipient/UserNotificationEventRecipientList.class.php b/wcfsetup/install/files/lib/data/user/notification/event/recipient/UserNotificationEventRecipientList.class.php
index 0dc913aa719da2e0d80f25aee131aa789c7a9e42..4eb81cbd43d57380aa331f9a0fafebfea6a6602e 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/notification/event/recipient/UserNotificationEventRecipientList.class.php
+++ b/wcfsetup/install/files/lib/data/user/notification/event/recipient/UserNotificationEventRecipientList.class.php
@@ -19,7 +19,9 @@ class UserNotificationEventRecipientList extends UserList
      */
     public function __construct()
     {
-        $this->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = event_to_user.userID";
+        $this->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = event_to_user.userID";
         $this->sqlSelects = 'user_table.*';
 
         parent::__construct();

diff --git a/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php b/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php
index f825830d41f83ce5c6df7c7622e7dab0f62b33d5..085ad1d18171a83907f5ef88bd70dab74d26d75b 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php
+++ b/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php
@@ -57,11 +57,18 @@ class UsersOnlineList extends SessionList
 
         $this->sqlSelects .= "user_avatar.*, user_option_value.*, user_group.userOnlineMarking, user_table.*";
 
-        $this->sqlConditionJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = session.userID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = session.userID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_avatar user_avatar ON user_avatar.avatarID = user_table.avatarID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_group user_group ON user_group.groupID = user_table.userOnlineGroupID";
+        $this->sqlConditionJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = session.userID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = session.userID
+            LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+            ON          user_option_value.userID = user_table.userID
+            LEFT JOIN   wcf" . WCF_N . "_user_avatar user_avatar
+            ON          user_avatar.avatarID = user_table.avatarID
+            LEFT JOIN   wcf" . WCF_N . "_user_group user_group
+            ON          user_group.groupID = user_table.userOnlineGroupID";
 
         $this->getConditionBuilder()->add('session.lastActivityTime > ?', [TIME_NOW - USER_ONLINE_TIMEOUT]);
     }

diff --git a/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitorList.class.php b/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitorList.class.php
index 603ff3779d703e04a062814c77d71b08b8ec45f0..01aea116a0c860079c6f4c6a05bbe79e51707fc8 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitorList.class.php
+++ b/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitorList.class.php
@@ -46,7 +46,10 @@ class UserProfileVisitorList extends DatabaseObjectList
         $this->sqlSelects .= "user_table.username, user_table.email, user_table.disableAvatar, user_table.enableGravatar, user_table.gravatarFileExtension";
         $this->sqlSelects .= ", user_avatar.*";
 
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = user_profile_visitor.userID";
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_avatar user_avatar ON user_avatar.avatarID = user_table.avatarID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = user_profile_visitor.userID
+            LEFT JOIN   wcf" . WCF_N . "_user_avatar user_avatar
+            ON          user_avatar.avatarID = user_table.avatarID";
     }
 }

diff --git a/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php b/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
index a5f6f20862feb82e46376210ddc9de04cd1a13eb..6f03ef176153ca8f68680d6b839ff1ed2012f79f 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
@@ -217,12 +217,20 @@ class UserTrophyAction extends AbstractDatabaseObjectAction
         if (!empty($userTrophyList->sqlConditionJoins)) {
             $userTrophyList->sqlConditionJoins .= ' ';
         }
-        $userTrophyList->sqlJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
-        $userTrophyList->sqlConditionJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
+        $userTrophyList->sqlJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+            ON          user_trophy.trophyID = trophy.trophyID';
+        $userTrophyList->sqlConditionJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+            ON          user_trophy.trophyID = trophy.trophyID';
 
         // trophy category join
-        $userTrophyList->sqlJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
-        $userTrophyList->sqlConditionJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
+        $userTrophyList->sqlJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_category category
+            ON          trophy.categoryID = category.categoryID';
+        $userTrophyList->sqlConditionJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_category category
+            ON          trophy.categoryID = category.categoryID';
 
         $userTrophyList->getConditionBuilder()->add('trophy.isDisabled = ?', [0]);
         $userTrophyList->getConditionBuilder()->add('category.isDisabled = ?', [0]);

diff --git a/wcfsetup/install/files/lib/data/user/trophy/UserTrophyList.class.php b/wcfsetup/install/files/lib/data/user/trophy/UserTrophyList.class.php
index 99149f090ae03b6437b40e3e84c274d5d8cc0c6b..04e0722f816fd9817fb99b84c94da3e6555bd802 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/trophy/UserTrophyList.class.php
+++ b/wcfsetup/install/files/lib/data/user/trophy/UserTrophyList.class.php
@@ -43,12 +43,20 @@ class UserTrophyList extends DatabaseObjectList
             if (!empty($trophyList->sqlConditionJoins)) {
                 $trophyList->sqlConditionJoins .= ' ';
             }
-            $trophyList->sqlJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
-            $trophyList->sqlConditionJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
+            $trophyList->sqlJoins .= '
+                LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+                ON          user_trophy.trophyID = trophy.trophyID';
+            $trophyList->sqlConditionJoins .= '
+                LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+                ON          user_trophy.trophyID = trophy.trophyID';
 
             // trophy category join
-            $trophyList->sqlJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
-            $trophyList->sqlConditionJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
+            $trophyList->sqlJoins .= '
+                LEFT JOIN   wcf' . WCF_N . '_category category
+                ON          trophy.categoryID = category.categoryID';
+            $trophyList->sqlConditionJoins .= '
+                LEFT JOIN   wcf' . WCF_N . '_category category
+                ON          trophy.categoryID = category.categoryID';
 
             $trophyList->getConditionBuilder()->add('trophy.isDisabled = ?', [0]);
             $trophyList->getConditionBuilder()->add('category.isDisabled = ?', [0]);

diff --git a/wcfsetup/install/files/lib/page/UnreadArticleListPage.class.php b/wcfsetup/install/files/lib/page/UnreadArticleListPage.class.php
index bf9acf27f169775a89f70966305e7785224ec148..365923773679141a241b46734c56d28b10cfbbf6 100644 (file)
--- a/wcfsetup/install/files/lib/page/UnreadArticleListPage.class.php
+++ b/wcfsetup/install/files/lib/page/UnreadArticleListPage.class.php
@@ -59,7 +59,11 @@ class UnreadArticleListPage extends ArticleListPage
         );
 
         if (WCF::getUser()->userID) {
-            $this->objectList->sqlConditionJoins = "LEFT JOIN wcf" . WCF_N . "_tracked_visit tracked_visit ON tracked_visit.objectTypeID = " . VisitTracker::getInstance()->getObjectTypeID('com.woltlab.wcf.article') . " AND tracked_visit.objectID = article.articleID AND tracked_visit.userID = " . WCF::getUser()->userID;
+            $this->objectList->sqlConditionJoins = "
+                LEFT JOIN   wcf" . WCF_N . "_tracked_visit tracked_visit
+                ON          tracked_visit.objectTypeID = " . VisitTracker::getInstance()->getObjectTypeID('com.woltlab.wcf.article') . "
+                        AND tracked_visit.objectID = article.articleID
+                        AND tracked_visit.userID = " . WCF::getUser()->userID;
             $this->objectList->getConditionBuilder()->add("(article.time > tracked_visit.visitTime OR tracked_visit.visitTime IS NULL)");
         }
     }

diff --git a/wcfsetup/install/files/lib/system/box/ArticleCommentListBoxController.class.php b/wcfsetup/install/files/lib/system/box/ArticleCommentListBoxController.class.php
index 202433d3e3ce5da15864cf786a7b25c80eedeb43..a2f67991331217d03083bf84eee6b38444d689b8 100644 (file)
--- a/wcfsetup/install/files/lib/system/box/ArticleCommentListBoxController.class.php
+++ b/wcfsetup/install/files/lib/system/box/ArticleCommentListBoxController.class.php
@@ -30,8 +30,11 @@ class ArticleCommentListBoxController extends AbstractCommentListBoxController
     {
         $accessibleCategoryIDs = ArticleCategory::getAccessibleCategoryIDs();
         if (!empty($accessibleCategoryIDs)) {
-            $commentList->sqlJoins .= ' INNER JOIN wcf' . WCF_N . '_article_content article_content ON article_content.articleContentID = comment.objectID';
-            $commentList->sqlJoins .= ' INNER JOIN wcf' . WCF_N . '_article article ON article.articleID = article_content.articleID';
+            $commentList->sqlJoins .= '
+                INNER JOIN  wcf' . WCF_N . '_article_content article_content
+                ON          article_content.articleContentID = comment.objectID
+                INNER JOIN  wcf' . WCF_N . '_article article
+                ON          article.articleID = article_content.articleID';
             $commentList->sqlSelects = 'article_content.title';
 
             $commentList->getConditionBuilder()->add('article.categoryID IN (?)', [$accessibleCategoryIDs]);

diff --git a/wcfsetup/install/files/lib/system/box/ProfileCommentListBoxController.class.php b/wcfsetup/install/files/lib/system/box/ProfileCommentListBoxController.class.php
index e0d37466fedfeacf58e4f789757448f746743731..30e921f2adbf98f9dcdf4d09613f1e5baaf66368 100644 (file)
--- a/wcfsetup/install/files/lib/system/box/ProfileCommentListBoxController.class.php
+++ b/wcfsetup/install/files/lib/system/box/ProfileCommentListBoxController.class.php
@@ -33,7 +33,9 @@ class ProfileCommentListBoxController extends AbstractCommentListBoxController
 
         if (WCF::getSession()->getPermission('user.profile.canViewUserProfile')) {
             $optionID = User::getUserOptionID('canViewProfile');
-            $commentList->sqlJoins .= ' INNER JOIN wcf' . WCF_N . '_user_option_value user_option_value ON user_option_value.userID = comment.objectID';
+            $commentList->sqlJoins .= '
+                INNER JOIN  wcf' . WCF_N . '_user_option_value user_option_value
+                ON          user_option_value.userID = comment.objectID';
 
             if (WCF::getUser()->userID) {
                 $followers = UserProfileHandler::getInstance()->getFollowers();

diff --git a/wcfsetup/install/files/lib/system/box/UserTrophyListBoxController.class.php b/wcfsetup/install/files/lib/system/box/UserTrophyListBoxController.class.php
index bb423c869fc04bd86e4eda6e8983e99e87c607db..5e73c64a248326189efb5ee758f1c6333876a951 100644 (file)
--- a/wcfsetup/install/files/lib/system/box/UserTrophyListBoxController.class.php
+++ b/wcfsetup/install/files/lib/system/box/UserTrophyListBoxController.class.php
@@ -76,12 +76,20 @@ class UserTrophyListBoxController extends AbstractDatabaseObjectListBoxControlle
         if (!empty($list->sqlConditionJoins)) {
             $list->sqlConditionJoins .= ' ';
         }
-        $list->sqlJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
-        $list->sqlConditionJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
+        $list->sqlJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+            ON          user_trophy.trophyID = trophy.trophyID';
+        $list->sqlConditionJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+            ON          user_trophy.trophyID = trophy.trophyID';
 
         // trophy category join
-        $list->sqlJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
-        $list->sqlConditionJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
+        $list->sqlJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_category category
+            ON          trophy.categoryID = category.categoryID';
+        $list->sqlConditionJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_category category
+            ON          trophy.categoryID = category.categoryID';
 
         $list->getConditionBuilder()->add('trophy.isDisabled = ?', [0]);
         $list->getConditionBuilder()->add('category.isDisabled = ?', [0]);

diff --git a/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php
index b1997855fd79df550f3e43bfc37c49a57e26cb50..ffad869ebb72004d5790670393dae22c230a2462 100644 (file)
--- a/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php
@@ -21,7 +21,9 @@ class CategoryCacheBuilder extends AbstractCacheBuilder
     {
         $list = new CategoryList();
         $list->sqlSelects = "object_type.objectType";
-        $list->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_object_type object_type ON object_type.objectTypeID = category.objectTypeID";
+        $list->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_object_type object_type
+            ON          object_type.objectTypeID = category.objectTypeID";
         $list->sqlOrderBy = "category.showOrder ASC";
         $list->readObjects();
 

diff --git a/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php b/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php
index 393cad4710078dee00412010601f82692dcf622b..00a7ce9098e5e7ba778c533d60f653bdb42c28ed 100644 (file)
--- a/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php
+++ b/wcfsetup/install/files/lib/system/category/TrophyCategoryType.class.php
@@ -67,8 +67,11 @@ class TrophyCategoryType extends AbstractCategoryType
         if (!empty($userTrophyList->sqlJoins)) {
             $userTrophyList->sqlJoins .= ' ';
         }
-        $userTrophyList->sqlJoins .= 'LEFT JOIN wcf' . WCF_N . '_trophy trophy ON user_trophy.trophyID = trophy.trophyID';
-        $userTrophyList->sqlJoins .= ' LEFT JOIN wcf' . WCF_N . '_category category ON trophy.categoryID = category.categoryID';
+        $userTrophyList->sqlJoins .= '
+            LEFT JOIN   wcf' . WCF_N . '_trophy trophy
+            ON          user_trophy.trophyID = trophy.trophyID
+            LEFT JOIN   wcf' . WCF_N . '_category category
+            ON          trophy.categoryID = category.categoryID';
 
         $userTrophyList->getConditionBuilder()->add('trophy.isDisabled = ?', [0]);
         $userTrophyList->getConditionBuilder()->add('category.isDisabled = ?', [0]);

diff --git a/wcfsetup/install/files/lib/system/cronjob/ExpiringPaidSubscriptionUserCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/ExpiringPaidSubscriptionUserCronjob.class.php
index 2762604686ab086724f3424797009e402b5f232d..115cbbd6e265a6770a08657cf5ce06597ef03fca 100644 (file)
--- a/wcfsetup/install/files/lib/system/cronjob/ExpiringPaidSubscriptionUserCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/ExpiringPaidSubscriptionUserCronjob.class.php
@@ -48,7 +48,9 @@ class ExpiringPaidSubscriptionUserCronjob extends AbstractCronjob
         );
 
         $paidSubscriptionUserList = new PaidSubscriptionUserList();
-        $paidSubscriptionUserList->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_paid_subscription paid_subscription ON paid_subscription.subscriptionID = paid_subscription_user.subscriptionID";
+        $paidSubscriptionUserList->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_paid_subscription paid_subscription
+            ON          paid_subscription.subscriptionID = paid_subscription_user.subscriptionID";
         $paidSubscriptionUserList->getConditionBuilder()->add('paid_subscription_user.endDate <> ?', [0]);
         $paidSubscriptionUserList->getConditionBuilder()->add(
             '(' . $conditionBuilder . ')',

diff --git a/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php b/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
index 1ca992806d5b71f8b4c191258a701205319bc0e0..740d7f0c51a5692a111249337a1d1f26d47b53ab 100644 (file)
--- a/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
+++ b/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
@@ -112,7 +112,10 @@ class ImportHandler extends SingletonFactory implements IAJAXInvokeAction
 
             $sql = "SELECT  import_mapping.newID
                     FROM    wcf" . WCF_N . "_import_mapping import_mapping
-                    " . ($tableName ? "LEFT JOIN " . $tableName . " object_table ON object_table." . $indexName . " = import_mapping.newID" : '') . "
+                    " . ($tableName ? "
+                        LEFT JOIN   " . $tableName . " object_table
+                        ON          object_table." . $indexName . " = import_mapping.newID
+                        " : '') . "
                     WHERE   import_mapping.importHash = ?
                         AND import_mapping.objectTypeID = ?
                         AND import_mapping.oldID = ?

diff --git a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php
index d8aadddb2555b1179a98ab49205e797e36774772..0c0e63402782d9b396a30d23b40955dde266ca2d 100644 (file)
--- a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php
+++ b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php
@@ -307,7 +307,10 @@ class ModerationQueueManager extends SingletonFactory
     protected function forceUserAssignment()
     {
         $queueList = new ModerationQueueList();
-        $queueList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_moderation_queue_to_user moderation_queue_to_user ON moderation_queue_to_user.queueID = moderation_queue.queueID AND moderation_queue_to_user.userID = " . WCF::getUser()->userID;
+        $queueList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_moderation_queue_to_user moderation_queue_to_user
+            ON          moderation_queue_to_user.queueID = moderation_queue.queueID
+                    AND moderation_queue_to_user.userID = " . WCF::getUser()->userID;
         $queueList->getConditionBuilder()->add("moderation_queue_to_user.queueID IS NULL");
         $queueList->readObjects();
 

diff --git a/wcfsetup/install/files/lib/system/page/handler/TrophyPageHandler.class.php b/wcfsetup/install/files/lib/system/page/handler/TrophyPageHandler.class.php
index eac75184759501c1799c8fa604f3d85d06b4c68f..f42eb9524cce3c606902f2348eefe7187e894a79 100644 (file)
--- a/wcfsetup/install/files/lib/system/page/handler/TrophyPageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/page/handler/TrophyPageHandler.class.php
@@ -50,7 +50,9 @@ class TrophyPageHandler extends AbstractLookupPageHandler
         if (!empty($trophyList->sqlJoins)) {
             $trophyList->sqlJoins .= ', ';
         }
-        $trophyList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_language_item language_item ON language_item.languageItem = trophy.title";
+        $trophyList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_language_item language_item
+            ON          language_item.languageItem = trophy.title";
         $trophyList->getConditionBuilder()->add(
             '(trophy.title LIKE ? OR language_item.languageItemValue LIKE ?)',
             ['%' . $searchString . '%', '%' . $searchString . '%']

diff --git a/wcfsetup/install/files/lib/system/poll/PollManager.class.php b/wcfsetup/install/files/lib/system/poll/PollManager.class.php
index 6efe7b8f0e2056961390e373cebe62cd3dd3c296..fa3de5c3d417d3b14f9916017dd330ae9d391215 100644 (file)
--- a/wcfsetup/install/files/lib/system/poll/PollManager.class.php
+++ b/wcfsetup/install/files/lib/system/poll/PollManager.class.php
@@ -431,7 +431,10 @@ class PollManager extends SingletonFactory
         // check for user votes
         if (WCF::getUser()->userID) {
             $optionList->sqlSelects = "CASE WHEN poll_option_vote.optionID IS NULL THEN '0' ELSE '1' END AS voted";
-            $optionList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_poll_option_vote poll_option_vote ON poll_option_vote.optionID = poll_option.optionID AND poll_option_vote.userID = " . WCF::getUser()->userID;
+            $optionList->sqlJoins = "
+                LEFT JOIN   wcf" . WCF_N . "_poll_option_vote poll_option_vote
+                ON          poll_option_vote.optionID = poll_option.optionID
+                        AND poll_option_vote.userID = " . WCF::getUser()->userID;
         } else {
             $optionList->sqlSelects = "'0' AS voted";
         }

diff --git a/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php b/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php
index 969317ce29b326c000f1271d92c74bd17fba75cd..f3899dd120b3e06a15ce727d9aed3eaad7341b2a 100644 (file)
--- a/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php
+++ b/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php
@@ -134,7 +134,9 @@ class ArticleSearch extends AbstractSearchableObjectType
      */
     public function getJoins()
     {
-        return 'INNER JOIN wcf' . WCF_N . '_article ON wcf' . WCF_N . '_article.articleID = ' . $this->getTableName() . '.articleID';
+        return '
+            INNER JOIN  wcf' . WCF_N . '_article
+            ON          wcf' . WCF_N . '_article.articleID = ' . $this->getTableName() . '.articleID';
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/search/PageSearch.class.php b/wcfsetup/install/files/lib/system/search/PageSearch.class.php
index bb7d8f2902e35b13a7aed8bde06bfe00b7f2e561..2558f6e19cb5bd680511f6aba33420e87a6a3e9e 100644 (file)
--- a/wcfsetup/install/files/lib/system/search/PageSearch.class.php
+++ b/wcfsetup/install/files/lib/system/search/PageSearch.class.php
@@ -142,7 +142,9 @@ class PageSearch extends AbstractSearchableObjectType
      */
     public function getJoins()
     {
-        return 'INNER JOIN wcf' . WCF_N . '_page ON wcf' . WCF_N . '_page.pageID = ' . $this->getTableName() . '.pageID';
+        return '
+            INNER JOIN  wcf' . WCF_N . '_page
+            ON          wcf' . WCF_N . '_page.pageID = ' . $this->getTableName() . '.pageID';
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
index faae58838c61b8202ee7b8a14411110428df8e69..179a06fe462e3c4b8b270cc3baa85ef923ac6d06 100644 (file)
--- a/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
@@ -38,8 +38,12 @@ class MultilingualPageSitemapObject extends AbstractSitemapObjectObjectType
         /** @var $pageList PageContentList */
         $pageList = parent::getObjectList();
 
-        $pageList->sqlConditionJoins = 'LEFT JOIN wcf' . WCF_N . '_page page ON page_content.pageID = page.pageID';
-        $pageList->sqlJoins = 'LEFT JOIN wcf' . WCF_N . '_page page ON page_content.pageID = page.pageID';
+        $pageList->sqlConditionJoins = '
+            LEFT JOIN   wcf' . WCF_N . '_page page
+            ON          page_content.pageID = page.pageID';
+        $pageList->sqlJoins = '
+            LEFT JOIN   wcf' . WCF_N . '_page page
+            ON          page_content.pageID = page.pageID';
         $pageList->getConditionBuilder()->add('page.isMultilingual = ?', [1]);
         $pageList->getConditionBuilder()->add('page.allowSpidersToIndex = ?', [1]);
 

diff --git a/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php b/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
index 34135275678daca30726189e0b3f2ec79905461a..0b403695dbec7277d3371969828d9cfd892d0154 100644 (file)
--- a/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
@@ -133,7 +133,9 @@ class TrophyConditionHandler extends SingletonFactory
     private function getUserIDs(Trophy $trophy)
     {
         $userList = new UserList();
-        $userList->sqlConditionJoins .= " LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID";
+        $userList->sqlConditionJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+            ON          user_option_value.userID = user_table.userID";
 
         $conditions = $trophy->getConditions();
         foreach ($conditions as $condition) {
@@ -196,7 +198,9 @@ class TrophyConditionHandler extends SingletonFactory
         $userList->sqlJoins = $pseudoUserList->sqlJoins;
 
         // We joining the user_trophy table to receive the userTrophyID, which should be deleted.
-        $userList->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_user_trophy user_trophy ON user_table.userID = user_trophy.userID";
+        $userList->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user_trophy user_trophy
+            ON          user_table.userID = user_trophy.userID";
 
         // We do not need the complete user object, but only the userTrophyID.
         // So that the UserList object can also assign the users (which is used

diff --git a/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php b/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php
index c93d4aee57953e5264f951e7f3aa25c0fbafd2e6..ea1b517482843b3d63f8233ad008b327750d4a67 100644 (file)
--- a/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php
@@ -47,7 +47,9 @@ class UserRebuildDataWorker extends AbstractRebuildDataWorker
         parent::initObjectList();
 
         $this->objectList->sqlSelects = 'user_option_value.userOption' . User::getUserOptionID('aboutMe') . ' AS aboutMe';
-        $this->objectList->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_user_option_value user_option_value ON user_option_value.userID = user_table.userID";
+        $this->objectList->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_user_option_value user_option_value
+            ON          user_option_value.userID = user_table.userID";
         $this->objectList->sqlOrderBy = 'user_table.userID';
     }