Skip to content

Commit bb1f4b9

Browse files
committed
Apply explicit global namespace resolution for constants
1 parent 0837a0b commit bb1f4b9

File tree

287 files changed

+757
-758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+757
-758
lines changed

wcfsetup/install/files/lib/acp/action/UserQuickSearchAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function execute(): RedirectResponse
135135
$conditionBuilder = new PreparedStatementConditionBuilder();
136136
$conditionBuilder->add('banned = ?', [0]);
137137
$conditionBuilder->add('activationCode <> ?', [0]);
138-
if ((int)REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER) {
138+
if ((int)\REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER) {
139139
$conditionBuilder->add('emailConfirmed IS NULL');
140140
}
141141

wcfsetup/install/files/lib/acp/form/ApplicationManagementForm.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function readFormParameters()
7979
{
8080
parent::readFormParameters();
8181

82-
if (!ENABLE_ENTERPRISE_MODE || WCF::getUser()->hasOwnerAccess()) {
82+
if (!\ENABLE_ENTERPRISE_MODE || WCF::getUser()->hasOwnerAccess()) {
8383
if (isset($_POST['cookieDomain'])) {
8484
$this->cookieDomain = StringUtil::trim($_POST['cookieDomain']);
8585
}
@@ -98,7 +98,7 @@ public function validate()
9898
{
9999
parent::validate();
100100

101-
if (!ENABLE_ENTERPRISE_MODE || WCF::getUser()->hasOwnerAccess()) {
101+
if (!\ENABLE_ENTERPRISE_MODE || WCF::getUser()->hasOwnerAccess()) {
102102
if (empty($this->domainName)) {
103103
throw new UserInputException('domainName');
104104
}
@@ -157,7 +157,7 @@ public function save()
157157
{
158158
parent::save();
159159

160-
if (!ENABLE_ENTERPRISE_MODE || WCF::getUser()->hasOwnerAccess()) {
160+
if (!\ENABLE_ENTERPRISE_MODE || WCF::getUser()->hasOwnerAccess()) {
161161
$sql = "UPDATE wcf1_application
162162
SET domainName = ?,
163163
cookieDomain = ?";

wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class ArticleAddForm extends AbstractForm
117117
* enables the comment function
118118
* @var int
119119
*/
120-
public $enableComments = ARTICLE_ENABLE_COMMENTS_DEFAULT_VALUE;
120+
public $enableComments = \ARTICLE_ENABLE_COMMENTS_DEFAULT_VALUE;
121121

122122
/**
123123
* article titles
@@ -330,7 +330,7 @@ public function readFormParameters()
330330
if (isset($_POST['metaDescription']) && \is_array($_POST['metaDescription'])) {
331331
$this->metaDescription = ArrayUtil::trim($_POST['metaDescription']);
332332
}
333-
if (MODULE_TAGGING && isset($_POST['tags']) && \is_array($_POST['tags'])) {
333+
if (\MODULE_TAGGING && isset($_POST['tags']) && \is_array($_POST['tags'])) {
334334
$this->tags = ArrayUtil::trim($_POST['tags']);
335335
}
336336
if (isset($_POST['teaser']) && \is_array($_POST['teaser'])) {
@@ -596,7 +596,7 @@ public function save()
596596
$this->publicationDate = '';
597597
$this->categoryID = 0;
598598
$this->publicationStatus = Article::PUBLISHED;
599-
$this->enableComments = ARTICLE_ENABLE_COMMENTS_DEFAULT_VALUE;
599+
$this->enableComments = \ARTICLE_ENABLE_COMMENTS_DEFAULT_VALUE;
600600
$this->title = $this->teaser = $this->content = $this->images = $this->imageID = $this->teaserImages = $this->teaserImageID = $this->tags = [];
601601
$this->metaTitle = $this->metaDescription = [];
602602

wcfsetup/install/files/lib/acp/form/ArticleEditForm.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function readData()
193193
$this->metaDescription[$languageID] = $content->metaDescription;
194194

195195
// get tags
196-
if (MODULE_TAGGING) {
196+
if (\MODULE_TAGGING) {
197197
$this->tags[$languageID] = TagEngine::getInstance()->getObjectTags(
198198
'com.woltlab.wcf.article',
199199
$content->articleContentID,

wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected function createForm()
111111
public function save()
112112
{
113113
if ($this->formAction === "create") {
114-
$this->additionalFields['packageID'] = PACKAGE_ID;
114+
$this->additionalFields['packageID'] = \PACKAGE_ID;
115115
$this->additionalFields['name'] = 'placeholder_' . StringUtil::getRandomID();
116116
}
117117

wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static function (TextFormField $formField) {
140140
public function save()
141141
{
142142
if ($this->formAction === 'create') {
143-
$this->additionalFields['packageID'] = PACKAGE_ID;
143+
$this->additionalFields['packageID'] = \PACKAGE_ID;
144144
$this->additionalFields['cronjobName'] = 'com.woltlab.wcf.cronjob';
145145
}
146146

wcfsetup/install/files/lib/acp/form/DataImportForm.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public function readData()
306306
parent::readData();
307307

308308
if (!isset($_POST['fileSystemPath'])) {
309-
$this->fileSystemPath = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : WCF_DIR);
309+
$this->fileSystemPath = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : \WCF_DIR);
310310
}
311311

312312
if (empty($_POST)) {

wcfsetup/install/files/lib/acp/form/DevtoolsProjectAddForm.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected function createForm()
142142
TextFormField::create('path')
143143
->label('wcf.acp.devtools.project.path')
144144
->description('wcf.acp.devtools.project.path.description')
145-
->placeholder(WCF_DIR)
145+
->placeholder(\WCF_DIR)
146146
->required()
147147
->addValidator(new FormFieldValidator('validPath', function (TextFormField $formField) {
148148
// ensure that unified directory separators are used

wcfsetup/install/files/lib/acp/form/LoginForm.class.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected function createForm()
7777
)),
7878
CaptchaFormField::create()
7979
->available($this->useCaptcha)
80-
->objectType(CAPTCHA_TYPE)
80+
->objectType(\CAPTCHA_TYPE)
8181
]);
8282
}
8383

@@ -114,16 +114,16 @@ public function readParameters()
114114
}
115115

116116
// check authentication failures
117-
if (ENABLE_USER_AUTHENTICATION_FAILURE) {
117+
if (\ENABLE_USER_AUTHENTICATION_FAILURE) {
118118
$failures = UserAuthenticationFailure::countIPFailures(UserUtil::getIpAddress());
119-
if (USER_AUTHENTICATION_FAILURE_IP_BLOCK && $failures >= USER_AUTHENTICATION_FAILURE_IP_BLOCK) {
119+
if (\USER_AUTHENTICATION_FAILURE_IP_BLOCK && $failures >= \USER_AUTHENTICATION_FAILURE_IP_BLOCK) {
120120
throw new NamedUserException(HtmlString::fromSafeHtml(
121121
WCF::getLanguage()->getDynamicVariable('wcf.user.login.blocked')
122122
));
123123
}
124-
if (USER_AUTHENTICATION_FAILURE_IP_CAPTCHA && $failures >= USER_AUTHENTICATION_FAILURE_IP_CAPTCHA) {
124+
if (\USER_AUTHENTICATION_FAILURE_IP_CAPTCHA && $failures >= \USER_AUTHENTICATION_FAILURE_IP_CAPTCHA) {
125125
$this->useCaptcha = true;
126-
} elseif (USER_AUTHENTICATION_FAILURE_USER_CAPTCHA) {
126+
} elseif (\USER_AUTHENTICATION_FAILURE_USER_CAPTCHA) {
127127
if (isset($_POST['username'])) {
128128
$user = User::getUserByUsername(StringUtil::trim($_POST['username']));
129129
if (!$user->userID) {
@@ -134,8 +134,8 @@ public function readParameters()
134134
$failures = UserAuthenticationFailure::countUserFailures($user->userID);
135135
if (
136136
// @phpstan-ignore booleanAnd.leftAlwaysTrue
137-
USER_AUTHENTICATION_FAILURE_USER_CAPTCHA
138-
&& $failures >= USER_AUTHENTICATION_FAILURE_USER_CAPTCHA
137+
\USER_AUTHENTICATION_FAILURE_USER_CAPTCHA
138+
&& $failures >= \USER_AUTHENTICATION_FAILURE_USER_CAPTCHA
139139
) {
140140
$this->useCaptcha = true;
141141
}
@@ -237,7 +237,7 @@ protected function tryAuthenticationByEmail(
237237

238238
protected function saveAuthenticationFailure(string $errorField, string $username): void
239239
{
240-
if (!ENABLE_USER_AUTHENTICATION_FAILURE) {
240+
if (!\ENABLE_USER_AUTHENTICATION_FAILURE) {
241241
return;
242242
}
243243

wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ function (IFormDocument $document, array $parameters) {
117117
$parameters['boxData'] = [];
118118

119119
if ($this->formAction === 'create') {
120-
$parameters['data']['packageID'] = PACKAGE_ID;
120+
$parameters['data']['packageID'] = \PACKAGE_ID;
121121
$parameters['data']['identifier'] = '';
122-
$parameters['boxData']['packageID'] = PACKAGE_ID;
122+
$parameters['boxData']['packageID'] = \PACKAGE_ID;
123123
$parameters['boxData']['boxType'] = 'menu';
124124
}
125125

0 commit comments

Comments
 (0)