? bad-behavior.2.0.35.zip Index: badbehavior.admin.inc =================================================================== RCS file: badbehavior.admin.inc diff -N badbehavior.admin.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ badbehavior.admin.inc 19 Dec 2009 20:37:06 -0000 @@ -0,0 +1,106 @@ + t('Response'), 'field' => 'w.http_response'), + array('data' => t('Reason'), 'field' => 'w.denied_reason'), + array('data' => t('Date'), 'field' => 'w.date', 'sort' => 'desc'), + array('data' => t('IP'), 'field' => 'w.ip'), + array('data' => t('Agent'), 'field' => 'w.user_agent', 'colspan' => 2) + ); + if (variable_get('badbehavior_verbose_logging_enable', 0)) { + $sql = 'SELECT w.* FROM {bad_behavior_log} w '. tablesort_sql($header); + } + else { + $sql = "SELECT w.* FROM {bad_behavior_log} w WHERE w.key <> '00000000' " . tablesort_sql($header); + } + $result = pager_query($sql, 50); + while ($behave = db_fetch_object($result)) { + $response = bb2_get_response($behave->key); + $behave->localdate = bb2_convertdate($behave->date); + $rows[] = array('data' => array($response['response'], $response['log'], $behave->date, $behave->ip, $behave->user_agent, l(t('details'), "admin/reports/badbehavior/event/$behave->id"))); + } + + if (!$rows) { + $rows[] = array(array('data' => t('No log messages available.'), 'colspan' => '6')); + } + + $output = theme('table', $header, $rows) . theme('pager', NULL, 50, 0); + + return $output; +} + +function badbehavior_event($id = NULL) { + if (file_exists(BB2_CWD .'/bad-behavior/core.inc.php') && file_exists(BB2_CWD .'/bad-behavior/version.inc.php') && file_exists(BB2_CWD .'/bad-behavior/responses.inc.php')) { + require_once(BB2_CWD .'/bad-behavior/version.inc.php'); + require_once(BB2_CWD .'/bad-behavior/core.inc.php'); + require_once(BB2_CWD .'/bad-behavior/responses.inc.php'); + } + else { + return 'Bad Behavior is not installed correctly. Please download Bad Behavior and extract /bad-behavior/bad-behavior from the zip to sites/all/libraries/bad-behavior'; + } + + $output = ''; + $result = db_query('SELECT w.* FROM {bad_behavior_log} w WHERE w.id = %d', $id); + if ($behave = db_fetch_object($result)) { + $response = bb2_get_response($behave->key); + $behave->localdate = bb2_convertdate($behave->date); + $output .= ''; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= ' '; + $output .= '
'. t('IP Addr') .''. $behave->ip .'
'. t('Hostname') .''. gethostbyaddr($behave->ip) .' ('. l('whois', 'http://www.whois.sc/'. $behave->ip) .')
'. t('Date') .''. $behave->date .'
'. t('Request type') .''. $behave->request_method .'
'. t('URI') .''. $behave->request_uri .'
'. t('Protocol') .''. $behave->server_protocol .'
'. t('User Agent') .''. $behave->user_agent .'
'. t('Headers') .''. $behave->http_headers .'
'. t('Request Entity') .''. $behave->request_entity .'
'. t('Denied Reason') .''. $response['log'] .'
'. t('Explanation') .''. $response['explanation'] .'
'. t('Response') .''. $response['response'] .'
'; + } + return $output; +} + +function badbehavior_settings() { + $form['badbehavior_email'] = array( + '#type' => 'textfield', + '#title' => t('Administrator Email'), + '#default_value' => variable_get('badbehavior_email', 'badbots@ioerror.us'), + '#size' => 50, + '#maxlength' => 50, + '#description' => t('Administrator email address for blocked users to contact to gain access'), + ); + $form['badbehavior_strict_mode_enable'] = array( + '#type' => 'radios', + '#title' => 'Enable Strict Mode', + '#default_value' => variable_get('badbehavior_strict_mode_enable', 0), + '#options' => array(t('Disabled'), t('Enabled')), + '#description' => t('Enable strict checking (blocks more spam but may block some people)'), + ); + $form['badbehavior_verbose_logging_enable'] = array( + '#type' => 'radios', + '#title' => 'Enable Verbose Logging', + '#default_value' => variable_get('badbehavior_verbose_logging_enable', 0), + '#options' => array(t('Disabled'), t('Enabled')), + '#description' => t('Enables or disables verbose logging which includes all requests, not just failed ones'), + ); + + return system_settings_form($form); +} Index: badbehavior.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/badbehavior/badbehavior.module,v retrieving revision 1.11.4.5 diff -u -p -r1.11.4.5 badbehavior.module --- badbehavior.module 1 Sep 2009 21:33:28 -0000 1.11.4.5 +++ badbehavior.module 19 Dec 2009 20:37:06 -0000 @@ -4,7 +4,7 @@ define('BB2_CWD', './sites/all/libraries'); /** - * Implementation of hook_help(). + * Implements hook_help(). */ function badbehavior_help($path, $arg) { $output = ''; @@ -17,134 +17,51 @@ function badbehavior_help($path, $arg) { } /** - * Implementation of hook_menu(). - */ -function badbehavior_menu() { - $items = array(); + * Implements hook_perm(). + */ +function badbehavior_perm() { + return array('administer bad behavior'); +} +/** + * Implements hook_menu(). + */ +function badbehavior_menu() { $items['admin/settings/badbehavior'] = array( 'title' => 'Bad behavior', 'description' => 'Configure automatic spam blocking for your site.', 'page callback' => 'drupal_get_form', 'page arguments' => array('badbehavior_settings'), - 'access arguments' => array('administer bad behavior') + 'access arguments' => array('administer bad behavior'), + 'file' => 'badbehavior.admin.inc', ); $items['admin/reports/badbehavior'] = array( 'title' => 'Bad behavior', 'description' => 'Examine the spam blocking logs for your web site.', 'page callback' => 'badbehavior_overview', - 'access arguments' => array('administer bad behavior') + 'access arguments' => array('administer bad behavior'), + 'file' => 'badbehavior.admin.inc', ); $items['admin/reports/badbehavior/event'] = array( 'title' => 'Details', 'page callback' => 'badbehavior_event', 'access arguments' => array('administer bad behavior'), - 'type' => MENU_CALLBACK); - - return $items; -} - -function badbehavior_overview() { - if (file_exists(BB2_CWD .'/bad-behavior/core.inc.php') && file_exists(BB2_CWD .'/bad-behavior/version.inc.php') && file_exists(BB2_CWD .'/bad-behavior/responses.inc.php')) { - require_once(BB2_CWD .'/bad-behavior/version.inc.php'); - require_once(BB2_CWD .'/bad-behavior/core.inc.php'); - require_once(BB2_CWD .'/bad-behavior/responses.inc.php'); - } - else { - return 'Bad Behavior is not installed correctly. Please download Bad Behavior and extract /bad-behavior/bad-behavior from the zip to sites/all/libraries/bad-behavior'; - } - - $header = array( - array('data' => t('Response'), 'field' => 'w.http_response'), - array('data' => t('Reason'), 'field' => 'w.denied_reason'), - array('data' => t('Date'), 'field' => 'w.date', 'sort' => 'desc'), - array('data' => t('IP'), 'field' => 'w.ip'), - array('data' => t('Agent'), 'field' => 'w.user_agent', 'colspan' => 2) + 'type' => MENU_CALLBACK, + 'file' => 'badbehavior.admin.inc', ); - if (variable_get('badbehavior_verbose_logging_enable', 0)) { - $sql = 'SELECT w.* FROM {bad_behavior_log} w '. tablesort_sql($header); - } - else { - $sql = "SELECT w.* FROM {bad_behavior_log} w WHERE w.key <> '00000000' " . tablesort_sql($header); - } - $result = pager_query($sql, 50); - while ($behave = db_fetch_object($result)) { - $response = bb2_get_response($behave->key); - $behave->localdate = bb2_convertdate($behave->date); - $rows[] = array('data' => array($response['response'], $response['log'], $behave->date, $behave->ip, $behave->user_agent, l(t('details'), "admin/reports/badbehavior/event/$behave->id"))); - } - - if (!$rows) { - $rows[] = array(array('data' => t('No log messages available.'), 'colspan' => '6')); - } - - $output = theme('table', $header, $rows) . theme('pager', NULL, 50, 0); - - return $output; + return $items; } -function badbehavior_event($id = NULL) { - if (file_exists(BB2_CWD .'/bad-behavior/core.inc.php') && file_exists(BB2_CWD .'/bad-behavior/version.inc.php') && file_exists(BB2_CWD .'/bad-behavior/responses.inc.php')) { +/** + * Implements hook_boot(). + */ +function badbehavior_boot() { + if (file_exists(BB2_CWD .'/bad-behavior/core.inc.php') && file_exists(BB2_CWD .'/bad-behavior/version.inc.php')) { require_once(BB2_CWD .'/bad-behavior/version.inc.php'); require_once(BB2_CWD .'/bad-behavior/core.inc.php'); - require_once(BB2_CWD .'/bad-behavior/responses.inc.php'); - } - else { - return 'Bad Behavior is not installed correctly. Please download Bad Behavior and extract /bad-behavior/bad-behavior from the zip to sites/all/libraries/bad-behavior'; - } - - $output = ''; - $result = db_query('SELECT w.* FROM {bad_behavior_log} w WHERE w.id = %d', $id); - if ($behave = db_fetch_object($result)) { - $response = bb2_get_response($behave->key); - $behave->localdate = bb2_convertdate($behave->date); - $output .= ''; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= ' '; - $output .= '
'. t('IP Addr') .''. $behave->ip .'
'. t('Hostname') .''. gethostbyaddr($behave->ip) .' ('. l('whois', 'http://www.whois.sc/'. $behave->ip) .')
'. t('Date') .''. $behave->date .'
'. t('Request type') .''. $behave->request_method .'
'. t('URI') .''. $behave->request_uri .'
'. t('Protocol') .''. $behave->server_protocol .'
'. t('User Agent') .''. $behave->user_agent .'
'. t('Headers') .''. $behave->http_headers .'
'. t('Request Entity') .''. $behave->request_entity .'
'. t('Denied Reason') .''. $response['log'] .'
'. t('Explanation') .''. $response['explanation'] .'
'. t('Response') .''. $response['response'] .'
'; + bb2_install(); + bb2_start(bb2_read_settings()); } - return $output; -} - -function badbehavior_perm() { - return array('administer bad behavior'); -} - -function badbehavior_settings() { - $form['badbehavior_email'] = array( - '#type' => 'textfield', - '#title' => t('Administrator Email'), - '#default_value' => variable_get('badbehavior_email', 'badbots@ioerror.us'), - '#size' => 50, - '#maxlength' => 50, - '#description' => t('Administrator email address for blocked users to contact to gain access'), - ); - $form['badbehavior_strict_mode_enable'] = array( - '#type' => 'radios', - '#title' => 'Enable Strict Mode', - '#default_value' => variable_get('badbehavior_strict_mode_enable', 0), - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enable strict checking (blocks more spam but may block some people)'), - ); - $form['badbehavior_verbose_logging_enable'] = array( - '#type' => 'radios', - '#title' => 'Enable Verbose Logging', - '#default_value' => variable_get('badbehavior_verbose_logging_enable', 0), - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enables or disables verbose logging which includes all requests, not just failed ones'), - ); - - return system_settings_form($form); } // Return current time in the format preferred by your database. @@ -219,15 +136,6 @@ function bb2_relative_path() { return $base_path; } -function badbehavior_boot() { - if (file_exists(BB2_CWD .'/bad-behavior/core.inc.php') && file_exists(BB2_CWD .'/bad-behavior/version.inc.php')) { - require_once(BB2_CWD .'/bad-behavior/version.inc.php'); - require_once(BB2_CWD .'/bad-behavior/core.inc.php'); - bb2_install(); - bb2_start(bb2_read_settings()); - } -} - function bb2_convertdate($bbdate) { $timestamp = strtotime($bbdate .' UTC'); return format_date($timestamp, 'small');