Wikinaut has submitted this change and it was merged.
Change subject: removed superfluous wfDebug statements
......................................................................
removed superfluous wfDebug statements
Bug 46053
Change-Id: I1e4aa11aa13bd9eef2f1ac94c020b21d3a3166d7
---
M OpenID.hooks.php
M SpecialOpenID.body.php
M SpecialOpenIDLogin.body.php
M SpecialOpenIDServer.body.php
4 files changed, 3 insertions(+), 27 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 59e4f33..4c3dd0d 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -464,8 +464,6 @@
$dbw->delete( 'user_openid', array( 'uoi_user' =>
$userID ) );
$wgOut->addHTML( "OpenID " . wfMessage(
'usermerge-userdeleted', $username, $userID )->escaped() . "<br />\n" );
- wfDebug( "OpenID: deleted OpenID user $username
($userID)\n" );
-
}
return true;
@@ -492,11 +490,10 @@
$dbw->update( 'user_openid', array( 'uoi_user'
=> $toUserID ), array( 'uoi_user' => $fromUserID ) );
$wgOut->addHTML( "OpenID " . wfMessage(
'usermerge-updating', 'user_openid', $fromUsername, $toUsername )->escaped() .
"<br />\n" );
- wfDebug( "OpenID: transferred OpenID(s) of
$fromUsername ($fromUserID) => $toUsername ($toUserID)\n" );
-
} else {
+
$wgOut->addHTML( wfMessage(
'openid-openids-were-not-merged' )->escaped() . "<br />\n" );
- wfDebug( "OpenID: OpenID(s) were not merged for
merged users $fromUsername ($fromUserID) => $toUsername ($toUserID)\n" );
+
}
}
return true;
diff --git a/SpecialOpenID.body.php b/SpecialOpenID.body.php
index 5298e13..39c73a0 100644
--- a/SpecialOpenID.body.php
+++ b/SpecialOpenID.body.php
@@ -164,11 +164,9 @@
$canLogin = false;
foreach ( $wgOpenIDConsumerAllow as $allow ) {
if ( preg_match( $allow, $openid_url ) ) {
- wfDebug( "OpenID: $openid_url matched
allow pattern $allow.\n" );
$canLogin = true;
foreach ( $wgOpenIDConsumerDeny as
$deny ) {
if ( preg_match( $deny,
$openid_url ) ) {
- wfDebug( "OpenID:
$openid_url matched deny pattern $deny.\n" );
$canLogin = false;
break;
}
@@ -180,11 +178,9 @@
$canLogin = true;
foreach ( $wgOpenIDConsumerDeny as $deny ) {
if ( preg_match( $deny, $openid_url ) ) {
- wfDebug( "OpenID: $openid_url matched
deny pattern $deny.\n" );
$canLogin = false;
foreach ( $wgOpenIDConsumerAllow as
$allow ) {
if ( preg_match( $allow,
$openid_url ) ) {
- wfDebug( "OpenID:
$openid_url matched allow pattern $allow.\n" );
$canLogin = true;
break;
}
@@ -249,7 +245,6 @@
$consumer = $this->getConsumer();
if ( !$consumer ) {
- wfDebug( "OpenID: no consumer\n" );
$wgOut->showErrorPage( 'openiderror', 'openiderrortext'
);
return;
}
diff --git a/SpecialOpenIDLogin.body.php b/SpecialOpenIDLogin.body.php
index b368fb0..9c8fa96 100644
--- a/SpecialOpenIDLogin.body.php
+++ b/SpecialOpenIDLogin.body.php
@@ -87,7 +87,6 @@
if ( array_key_exists( $wgOpenIDForcedProvider,
$wgOpenIDProviders ) ) {
$url =
$wgOpenIDProviders[$wgOpenIDForcedProvider]['openid-url'];
- wfDebug( "OpenID:
wgOpenIDForcedProvider $wgOpenIDForcedProvider defined => $url\n" );
// make sure that the associated
provider Url does not contain {username} placeholder
// and try to use an optional
openid-selection-url from the $wgOpenIDProviders array
@@ -99,7 +98,6 @@
$skipTokenTestBecauseForcedProvider = true;
$openid_url =
$wgOpenIDProviders[$wgOpenIDForcedProvider]['openid-selection-url'];
} else {
- wfDebug( "OpenID:
Error: wgOpenIDForcedProvider $wgOpenIDForcedProvider defined, but
wgOpenIDProviders array has an invalid provider Url. Must not contain a
username placeholder!\n");
$this->showErrorPage(
'openid-error-wrong-force-provider-setting', array( $wgOpenIDForcedProvider ) );
return;
}
@@ -542,7 +540,6 @@
list( $openid, $sreg, $ax ) = $this->fetchValues();
if ( is_null( $openid ) ) {
- wfDebug( "OpenID: aborting in ChooseName because
identity_url is missing\n" );
$this->clearValues();
# No messing around, here
$wgOut->showErrorPage( 'openiderror', 'openiderrortext'
);
@@ -586,7 +583,6 @@
$name = $this->getUserName( $openid, $sreg, $ax,
$choice, $nameValue );
if ( !$name || !$this->userNameOK( $name ) ) {
- wfDebug( "OpenID: Name not OK: '$name'\n" );
$this->chooseNameForm( $openid, $sreg, $ax );
return;
}
@@ -597,7 +593,6 @@
if ( is_null( $user ) ) {
- wfDebug( "OpenID: aborting in ChooseName because we
could not create user object\n" );
$this->clearValues();
$wgOut->showErrorPage( 'openiderror', 'openiderrortext'
);
return;
@@ -623,7 +618,7 @@
wfRestoreWarnings();
if ( is_null( $response ) ) {
- wfDebug( "OpenID: aborting in auth because no response
was recieved\n" );
+ wfDebug( "OpenID: aborting in auth because no response
was received\n" );
$wgOut->showErrorPage( 'openiderror', 'openiderrortext'
);
return;
}
@@ -661,7 +656,6 @@
wfRestoreWarnings();
if ( is_null( $openid ) ) {
- wfDebug( "OpenID: aborting in auth success
because identity URL is missing\n" );
$wgOut->showErrorPage( 'openiderror',
'openiderrortext' );
return;
}
diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php
index aa394d0..b75de13 100644
--- a/SpecialOpenIDServer.body.php
+++ b/SpecialOpenIDServer.body.php
@@ -322,16 +322,12 @@
assert( isset( $url ) && strlen( $url ) > 0 );
- wfDebug( "OpenID: OpenIDServer received: '$url'.\n" );
- wfDebug( "OpenID: OpenIDServer received request: " . print_r(
$request, true ) . "\n" );
-
# by default, use the $wgUser if s/he is logged-in on this
OpenID-Server-Wiki
# check, if there is an expressed request for a distinct
OpenID-Server-Username
# from the received OpenID Url /User:Name
$otherName = $this->UrlToUserName( $url );
- wfDebug( "OpenID: received name '$otherName'\n");
# if there is a expressed request for /User:Name and
# if this is an existing user Name on the OpenID-Server Wiki
@@ -350,7 +346,6 @@
if ( ( $wgUser->getId() == 0 )
|| ( isset( $otherUser ) && ( $otherUser->getId() !=
$wgUser->getId() ) ) ) {
- wfDebug( "OpenID: User '$otherName' not logged in,
prepare login form for '$otherName'\n" );
if ( $imm ) {
return $request->answer( false,
$this->serverUrl() );
} else {
@@ -369,13 +364,11 @@
}
}
- wfDebug( "OpenID: User is logged in\n" );
assert( $wgUser->getId() != 0 );
# Is the user an OpenID user?
if ( !$wgOpenIDAllowServingOpenIDUserAccounts &&
$this->getUserOpenIDInformation( $wgUser ) ) {
- wfDebug( "OpenID: Not one of our users; logs in with
OpenID.\n" );
return $request->answer( false, $this->serverUrl() );
}
@@ -408,7 +401,6 @@
# Is there a trust record?
if ( is_null( $trust ) ) {
- wfDebug( "OpenID: No trust record.\n" );
if ( $imm ) {
return $request->answer( false,
$this->serverUrl() );
} else {
@@ -425,7 +417,6 @@
# NB: exactly equal
if ( $trust === false ) {
- wfDebug( "OpenID: User specified not to allow trust.\n"
);
return $request->answer( false, $this->serverUrl() );
}
@@ -462,7 +453,6 @@
wfSuppressWarnings();
$response = $request->answer( true, $this->serverUrl(),
$this->getLocalIdentity( $wgUser ), null );
- wfDebug( "OpenID: response: " . print_r( $response, true ) .
"\n" );
wfRestoreWarnings();
--
To view, visit https://gerrit.wikimedia.org/r/97129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e4aa11aa13bd9eef2f1ac94c020b21d3a3166d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: Wikinaut <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
