Index: whois.admin.inc
===================================================================
RCS file: whois.admin.inc
diff -N whois.admin.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ whois.admin.inc 15 Jul 2009 12:24:41 -0000
@@ -0,0 +1,42 @@
+ 'fieldset',
+ '#title' => t('Basic configuration'),
+ '#collapsed' => TRUE,
+ );
+ $form['whois_settings']['whois_output_method'] = array(
+ '#type' => 'radios',
+ '#title' => t('Output method'),
+ '#default_value' => variable_get('whois_output_method', 'html'),
+ '#description' => t(''),
+ '#options' => array(
+ 'basic' => 'Basic',
+ 'html' => 'HTMLized',
+ 'object' => 'PHP object',
+ ),
+ );
+ $form['whois_settings']['whois_enable_ajax'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Dynamic lookup (AJAX)'),
+ '#default_value' => variable_get('whois_enable_ajax', 1),
+ '#description' => t('Lookup and view the whois results dynamically (i.e. without reloading page) using AJAX request.'),
+ );
+ $form['whois_settings']['whois_hourly_threshold'] = array('#type' => 'select',
+ '#title' => t('Hourly threshold'),
+ '#options' => drupal_map_assoc(array(2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59)),
+ '#default_value' => variable_get('whois_hourly_threshold', 13),
+ '#description' => t('The maximum number of whois lookups a user can perform per hour.'),
+ );
+ $form['whois_log_watchdog'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Log watchdog entry'),
+ '#default_value' => variable_get('whois_log_watchdog', 1),
+ '#description' => t('Log a watchdog entry for each whois lookup performed.'),
+ );
+ return system_settings_form($form);
+}
Index: whois.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/whois/whois.module,v
retrieving revision 1.3
diff -u -p -r1.3 whois.module
--- whois.module 12 Aug 2008 11:15:57 -0000 1.3
+++ whois.module 15 Jul 2009 12:30:16 -0000
@@ -40,6 +40,7 @@ function whois_menu() {
'title' => t('Whois lookup'),
'page callback' => 'whois_whois_page',
'access arguments' => array('access whois'),
+ 'file' => 'whois.pages.inc',
'type' => MENU_NORMAL_ITEM,
);
$items['admin/settings/whois'] = array(
@@ -48,147 +49,26 @@ function whois_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('whois_settings'),
'access arguments' => array('administer site configuration'),
+ 'file' => 'whois.admin.inc',
'type' => MENU_NORMAL_ITEM,
);
return $items;
}
-function whois_settings() {
- $form = array();
-
- $form['whois_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('Basic configuration'),
- '#collapsed' => TRUE,
- );
- $form['whois_settings']['whois_output_method'] = array(
- '#type' => 'radios',
- '#title' => t('Output method'),
- '#default_value' => variable_get('whois_output_method', 'html'),
- '#description' => t(''),
- '#options' => array(
- 'basic' => 'Basic',
- 'html' => 'HTMLized',
- 'object' => 'PHP object',
- ),
- );
- $form['whois_settings']['whois_enable_ajax'] = array(
- '#type' => 'checkbox',
- '#title' => t('Dynamic lookup (AJAX)'),
- '#default_value' => variable_get('whois_enable_ajax', 1),
- '#description' => t('Lookup and view the whois results dynamically (i.e. without reloading page) using AJAX request.'),
- );
- $form['whois_settings']['whois_hourly_threshold'] = array('#type' => 'select',
- '#title' => t('Hourly threshold'),
- '#options' => drupal_map_assoc(array(2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59)),
- '#default_value' => variable_get('whois_hourly_threshold', 13),
- '#description' => t('The maximum number of whois lookups a user can perform per hour.'),
- );
- $form['whois_log_watchdog'] = array(
- '#type' => 'checkbox',
- '#title' => t('Log watchdog entry'),
- '#default_value' => variable_get('whois_log_watchdog', 1),
- '#description' => t('Log a watchdog entry for each whois lookup performed.'),
- );
- return system_settings_form($form);
-}
-
-function whois_whois_page() {
- $output = '';
- $address = $_POST['address'] ? whois_parse_url($_POST['address']) : arg(1);
-
- if (isset($address)) {
- // Check for hourly threshold.
- if (flood_is_allowed('whois', variable_get('whois_hourly_threshold', 13))) {
- $output .= '
' . t('Whois lookup for %address:', array('%address' => $address)) . '
';
- $output .= whois_get_whois($address);
- }
- else {
- $output .= t("You cannot do more than %number whois lookups per hour. Please try again later.", array('%number' => variable_get('whois_hourly_threshold', 13)));
- }
- if (isset($_POST['address'])) {
- // Avoid debug information(devel.module) from being added to the preview.
- $GLOBALS['devel_shutdown'] = FALSE;
-
- if (variable_get('whois_log_watchdog', 1)) {
- // Watchdog entry for lookup request.
- watchdog('whois',
- t('Whois lookup for: %address', array('%address' => $address)),
- array($address), WATCHDOG_NOTICE, l('View', "whois/$address") . ' · ' . l('Address', "http://$address/"));
- }
-
- // Stop further processing and return requested data.
- exit(drupal_json(array('html' => $output)));
- }
- drupal_set_breadcrumb(array(l(t('Home'), ''), l(t('Whois lookup'), 'whois')));
- }
- // Load JS and CSS for dynamic lookups using AJAX.
- if (variable_get('whois_enable_ajax', 1)) {
- $path = drupal_get_path('module', 'whois');
- drupal_add_js($path . '/whois.js');
- drupal_add_css($path . '/whois.css');
- }
-
- return drupal_get_form('whois_whois_form') . '';
-}
-
-function whois_whois_form() {
- $form = array();
-
- $form['whois_lookup'] = array(
- '#type' => 'fieldset',
- '#collapsed' => TRUE,
- );
- $form['whois_lookup']['whois_address'] = array(
- '#type' => 'textfield',
- '#title' => t('Lookup address'),
- '#default_value' => arg(1),
- '#required' => TRUE,
- '#prefix' => '',
- );
- $form['whois_lookup']['whois_submit'] = array(
- '#type' => 'submit',
- '#value' => t('Lookup'),
- '#suffix' => '
',
- );
- $form['whois_lookup']['whois_description'] = array(
- '#value' => '' . t('Enter a domain name or IP address for whois information.') . '
',
- );
-
- return $form;
-}
-
-function whois_whois_form_submit($form, &$form_state) {
- global $user;
- $address = whois_parse_url($form_state['values']['whois_address']);
-
- if (variable_get('whois_log_watchdog', 1)) {
- // Watchdog entry for lookup request.
- watchdog('whois',
- t('Whois lookup for: %address', array('%address' => $address)),
- array($address), WATCHDOG_NOTICE, l('View', "whois/$address") . ' · ' . l('Address', "http://$address/"));
- }
-
- $form_state['redirect'] = 'whois/' . $address;
- return;
-}
-
function whois_get_whois($address) {
$data = '';
- $path = drupal_get_path('module', 'whois') . '/phpwhois/whois.main.php';
- if (!file_exists($path)) {
+ if (!file_exists(drupal_get_path('module', 'whois') .'/phpwhois/whois.main.php')) {
drupal_set_message(t('There are problems with Whois lookup setup. Report to the website administrators promptly!', array('@status' => url('admin/logs/status'))), 'error');
}
elseif ($address != '') {
- include_once('phpwhois/whois.main.php');
- include_once('phpwhois/whois.utils.php');
- $option = variable_get('whois_output_method', 'html');
+ include_once(drupal_get_path('module', 'whois') .'/phpwhois/whois.main.php');
+ include_once(drupal_get_path('module', 'whois') .'/phpwhois/whois.utils.php');
$whois = new Whois();
$result = $whois->Lookup($address);
- switch($option) {
+ switch(variable_get('whois_output_method', 'html')) {
case 'html':
if (!empty($result['rawdata'])) {
$utils = new utils;
@@ -236,4 +116,4 @@ function whois_parse_url($url) {
preg_match($r, $url, $result);
return $result[6];
-}
\ No newline at end of file
+}
Index: whois.pages.inc
===================================================================
RCS file: whois.pages.inc
diff -N whois.pages.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ whois.pages.inc 15 Jul 2009 12:29:36 -0000
@@ -0,0 +1,81 @@
+' . t('Whois lookup for %address:', array('%address' => $address)) . '';
+ $output .= whois_get_whois($address);
+ }
+ else {
+ $output .= t("You cannot do more than %number whois lookups per hour. Please try again later.", array('%number' => variable_get('whois_hourly_threshold', 13)));
+ }
+ if (isset($_POST['address'])) {
+ // Avoid debug information(devel.module) from being added to the preview.
+ $GLOBALS['devel_shutdown'] = FALSE;
+
+ if (variable_get('whois_log_watchdog', 1)) {
+ // Watchdog entry for lookup request.
+ watchdog('whois',
+ t('Whois lookup for: %address', array('%address' => $address)),
+ array($address), WATCHDOG_NOTICE, l('View', "whois/$address") . ' · ' . l('Address', "http://$address/"));
+ }
+
+ // Stop further processing and return requested data.
+ exit(drupal_json(array('html' => $output)));
+ }
+ drupal_set_breadcrumb(array(l(t('Home'), ''), l(t('Whois lookup'), 'whois')));
+ }
+ // Load JS and CSS for dynamic lookups using AJAX.
+ if (variable_get('whois_enable_ajax', 1)) {
+ drupal_add_js(drupal_get_path('module', 'whois') .'/whois.js');
+ drupal_add_css(drupal_get_path('module', 'whois') .'/whois.css');
+ }
+
+ return drupal_get_form('whois_whois_form') . '';
+}
+
+function whois_whois_form() {
+ $form = array();
+
+ $form['whois_lookup'] = array(
+ '#type' => 'fieldset',
+ '#collapsed' => TRUE,
+ );
+ $form['whois_lookup']['whois_address'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Lookup address'),
+ '#default_value' => arg(1),
+ '#required' => TRUE,
+ '#prefix' => '',
+ );
+ $form['whois_lookup']['whois_submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Lookup'),
+ '#suffix' => '
',
+ );
+ $form['whois_lookup']['whois_description'] = array(
+ '#value' => '' . t('Enter a domain name or IP address for whois information.') . '
',
+ );
+
+ return $form;
+}
+
+function whois_whois_form_submit($form, &$form_state) {
+ global $user;
+ $address = whois_parse_url($form_state['values']['whois_address']);
+
+ if (variable_get('whois_log_watchdog', 1)) {
+ // Watchdog entry for lookup request.
+ watchdog('whois',
+ t('Whois lookup for: %address', array('%address' => $address)),
+ array($address), WATCHDOG_NOTICE, l('View', "whois/$address") . ' · ' . l('Address', "http://$address/"));
+ }
+
+ $form_state['redirect'] = 'whois/' . $address;
+ return;
+}