[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Remove temporary cookie block logging

2017-07-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/365414 )

Change subject: Remove temporary cookie block logging
..


Remove temporary cookie block logging

Bug: T166247
Change-Id: Ib34819194a6a0fdc5e17b024e3099eacbd075074
---
M WikimediaEventsHooks.php
M extension.json
2 files changed, 0 insertions(+), 24 deletions(-)

Approvals:
  jenkins-bot: Verified
  Kaldari: Looks good to me, approved



diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 58b700b..d9fe8cf 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -634,27 +634,6 @@
}
 
/**
-* Called when User::getBlockedStatus() has been set
-*
-* @param $user User object
-*/
-   public static function onGetBlockedStatus( $user ) {
-   $blocked = $user->mBlock instanceof Block;
-   $rc = RequestContext::getMain();
-   $request = $rc->getRequest();
-   $isCookieSetOnAutoblock = $rc->getConfig()->get( 
'CookieSetOnAutoblock' );
-   $blockCookieVal = $request->getCookie( 'BlockID' );
-   $trigger = $user->blockTrigger;
-   if ( $isCookieSetOnAutoblock && $blockCookieVal > 0 && $blocked 
) {
-   $logData = [
-   'ip' => $request->getIP(),
-   'is_cookie_block' => $trigger === 'cookie-block'
-   ];
-   EventLogging::logEvent( 'CookieBlock', 16241436, 
$logData );
-   }
-   }
-
-   /**
 * In summer 2017 WMDE will run a banner campaign with a GuidedTour to 
encourage users to
 * create an account and edit.
 * The banner campaign will link to one of 2 pages (see examples)
diff --git a/extension.json b/extension.json
index 00e9134..c9e5bf6 100644
--- a/extension.json
+++ b/extension.json
@@ -76,9 +76,6 @@
],
"ChangesListSpecialPageStructuredFilters": [

"WikimediaEventsHooks::onChangesListSpecialPageStructuredFilters"
-   ],
-   "GetBlockedStatus": [
-   "WikimediaEventsHooks::onGetBlockedStatus"
]
},
"MessagesDirs": {

-- 
To view, visit https://gerrit.wikimedia.org/r/365414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib34819194a6a0fdc5e17b024e3099eacbd075074
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Remove temporary cookie block logging

2017-07-14 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/365414 )

Change subject: Remove temporary cookie block logging
..

Remove temporary cookie block logging

Bug: T166247
Change-Id: Ib34819194a6a0fdc5e17b024e3099eacbd075074
---
M WikimediaEventsHooks.php
M extension.json
2 files changed, 0 insertions(+), 24 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/14/365414/1

diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 58b700b..d9fe8cf 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -634,27 +634,6 @@
}
 
/**
-* Called when User::getBlockedStatus() has been set
-*
-* @param $user User object
-*/
-   public static function onGetBlockedStatus( $user ) {
-   $blocked = $user->mBlock instanceof Block;
-   $rc = RequestContext::getMain();
-   $request = $rc->getRequest();
-   $isCookieSetOnAutoblock = $rc->getConfig()->get( 
'CookieSetOnAutoblock' );
-   $blockCookieVal = $request->getCookie( 'BlockID' );
-   $trigger = $user->blockTrigger;
-   if ( $isCookieSetOnAutoblock && $blockCookieVal > 0 && $blocked 
) {
-   $logData = [
-   'ip' => $request->getIP(),
-   'is_cookie_block' => $trigger === 'cookie-block'
-   ];
-   EventLogging::logEvent( 'CookieBlock', 16241436, 
$logData );
-   }
-   }
-
-   /**
 * In summer 2017 WMDE will run a banner campaign with a GuidedTour to 
encourage users to
 * create an account and edit.
 * The banner campaign will link to one of 2 pages (see examples)
diff --git a/extension.json b/extension.json
index 00e9134..c9e5bf6 100644
--- a/extension.json
+++ b/extension.json
@@ -76,9 +76,6 @@
],
"ChangesListSpecialPageStructuredFilters": [

"WikimediaEventsHooks::onChangesListSpecialPageStructuredFilters"
-   ],
-   "GetBlockedStatus": [
-   "WikimediaEventsHooks::onGetBlockedStatus"
]
},
"MessagesDirs": {

-- 
To view, visit https://gerrit.wikimedia.org/r/365414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib34819194a6a0fdc5e17b024e3099eacbd075074
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits