From a1714da9045611c8b6d35483da8daf460b4e9dfc Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Sat, 17 Nov 2012 21:50:41 +0000
Subject: [PATCH] Issue #1559780 by sun: Fixed Remove ban_ip_action() from
core. It blocks the currently logged-in user. (and potentially, your entire
team).
---
core/modules/ban/ban.module | 27 ---------------------------
core/modules/system/system.install | 9 +++------
2 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module
index 12405ba1c9ac..9e9ed0f5c57d 100644
--- a/core/modules/ban/ban.module
+++ b/core/modules/ban/ban.module
@@ -71,30 +71,3 @@ function ban_menu() {
function ban_ip_load($iid) {
return db_query("SELECT * FROM {ban_ip} WHERE iid = :iid", array(':iid' => $iid))->fetchAssoc();
}
-
-/**
- * Implements hook_action_info().
- */
-function ban_action_info() {
- return array(
- 'ban_ip_action' => array(
- 'type' => 'user',
- 'label' => t('Ban IP address of current user'),
- 'configurable' => FALSE,
- 'triggers' => array('any'),
- ),
- );
-}
-
-/**
- * Bans the current user's IP address.
- *
- * @ingroup actions
- */
-function ban_ip_action() {
- $ip = ip_address();
- db_insert('ban_ip')
- ->fields(array('ip' => $ip))
- ->execute();
- watchdog('action', 'Banned IP address %ip', array('%ip' => $ip));
-}
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index e29674e68360..9157635c8397 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1934,14 +1934,11 @@ function system_update_8020() {
->execute();
// Rename {blocked_ips} table into {ban_ip}.
db_rename_table('blocked_ips', 'ban_ip');
- // Rename all references to the action callback.
- db_update('actions')
- ->fields(array('callback' => 'ban_ip_action'))
+ // Remove all references to the removed action callback.
+ db_delete('actions')
->condition('callback', 'system_block_ip_action')
->execute();
- // Rename the action's aid.
- db_update('actions')
- ->fields(array('aid' => 'ban_ip_action'))
+ db_delete('actions')
->condition('aid', 'system_block_ip_action')
->execute();
// Enable the new Ban module.
--
GitLab