This page provides an overview of your site\'s IP detection and language negotiation settings. You may configure which language is chosen when each country is detected from the user\'s IP, using the form below. All detectable languages are listed in the Detected country drop-down list, and all installed languages are listed in t the Language drop-down list. If a country is detected but doesn\'t have an entry in this list, the default language will be used.
'); return $help; } @@ -33,18 +40,18 @@ function geoip_language_help($path, $arg) { function geoip_language_menu() { $items = array(); - $items['admin/settings/language/geoip'] = array( + $items['admin/config/regional/language/configure/geoip'] = array( 'title' => 'GeoIP', - 'type' => MENU_LOCAL_TASK, 'weight' => 5, - 'page callback' => 'geoip_language_settings_overview', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('geoip_language_form'), 'access arguments' => array('administer languages'), 'file' => 'geoip_language.admin.inc', ); - $items['admin/settings/language/geoip/delete/%'] = array( + $items['admin/config/regional/language/configure/geoip/delete/%'] = array( 'title' => 'Delete GeoIP mapping', 'page callback' => 'drupal_get_form', - 'page arguments' => array('geoip_admin_delete_mapping', 5), + 'page arguments' => array('geoip_admin_delete_mapping', 7), 'access arguments' => array('administer languages'), 'type' => MENU_CALLBACK, 'file' => 'geoip_language.admin.inc', @@ -58,17 +65,21 @@ function geoip_language_menu() { * * @return array */ -function geoip_language_init() { - // Configured presentation language mode. - $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE); - - $drush = (function_exists('drush_verify_cli') && drush_verify_cli()); - - // Only take action if language negotiation is set to GeoIP and there is more - // than 1 enabled language. - if (!$drush && ($mode == GEOIP_LANGUAGE_NEGOTIATION_PATH) && ((int)variable_get('language_count', 1) > 1)) { - geoip_language_negotiation(); - } +function geoip_language_language_negotiation_info() { + return array(GEOIP_LANGUAGE_NEGOTIATION => array( + 'callbacks' => array( + 'language' => 'language_negotiation_from_geoip', + // 'switcher' => 'custom_language_switcher_callback', + // 'url_rewrite' => 'custom_language_url_rewrite_callback', + ), + 'file' => drupal_get_path('module', 'geoip_language') . '/geoip_language.module', + 'weight' => -4, + 'name' => 'GeoIP', + 'description' => t('Use the users IP to determine the language'), + 'config' => 'admin/config/regional/language/configure/geoip', + // 'cache' => 0, + ), + ); } /** @@ -78,76 +89,14 @@ function geoip_language_init() { * @return string * Language as ISO 639-1 Code */ -function geoip_language_negotiation() { - // Get a list of enabled languages. - $languages = language_list('enabled'); - $languages = $languages[1]; - - // Get the original q, as it is before path un-aliasing. This is important - // because a path alias which is the same as a language prefix will have been - // improperly un-aliased and the language prefix will be lost. - $query = array(); - parse_str($_SERVER['QUERY_STRING'], $query); - $q = $query['q']; - - // Mostly copied from language_initialize(). Do a basic path prefix lookup to - // determine the language. - $args = explode('/', $q); - $prefix = array_shift($args); - // Search prefix within enabled languages. - foreach ($languages as $language) { - if (!empty($language->prefix) && $language->prefix == $prefix) { - // Set the global language object. - $GLOBALS['language'] = $language; - // Rebuild $_GET['q'] with the language removed. - $_GET['q'] = implode('/', $args); - // Re-initialize the path. - drupal_init_path(); - // Make PressFlow happy by only storing the language code if there's an - // existing session. - if (count($_SESSION)) { - $_SESSION['geoip_language'] = $language->language; - } - return; - } - } - - // Begin fallbacks. At this point, we know that there is not a valid path - // prefix, so we must first determine a language, and then do a redirect to - // the current path, in that language. - - global $user; - // First check to see if a language was previously determined. - if (isset($_SESSION['geoip_language']) && isset($languages[$_SESSION['geoip_language']])) { - $language = $languages[$_SESSION['geoip_language']]; - } - // Fallback for user-preferred language. - elseif ($user->uid && isset($languages[$user->language])) { - $language = $languages[$user->language]; - } - // If all else fails, do a GeoIP lookup and redirect. - else { - $language = geoip_language_detect_language(); - } - - - // Set the global language object. - $GLOBALS['language'] = $language; - - global $base_path; - // Abort the redirect if bootstrap happened outside of index.php or if the - // requested path is inside the files directory - if (($_SERVER['SCRIPT_NAME'] != $base_path .'index.php') - || (strpos($_GET['q'], file_directory_path()) === 0) - || ($_SERVER['REQUEST_METHOD'] == 'POST')) { - return; - } - - // Now that the language is detected, do an absolute redirect to avoid page - // caching in the wrong language. - $url = url($_GET['q'], array('language' => $language, 'absolute' => TRUE, 'query' => drupal_query_string_encode($_GET, array('q')))); - drupal_goto($url, NULL, NULL, 301); - exit(); +function language_negotiation_from_geoip($languages) { + // Use the core URL language provider to get a valid language code. + include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/modules/locale/locale.module'; + include_once dirname(__FILE__) . '/../geoip.module'; + $langcode = geoip_language_detect_language(); + + return $langcode; } /** @@ -155,33 +104,33 @@ function geoip_language_negotiation() { * language_url_rewrite() doesn't add the path prefix for the default language, * so we are doing it here. This lessens the amount of redirection that * would occur because of a missing path prefix. + * + * @TODO Function disabled - looks like this is not necessary anymore in D7 */ -if (!function_exists('custom_url_rewrite_outbound')) { - function custom_url_rewrite_outbound(&$path, &$options, $original_path) { - global $language; - - if (variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) == GEOIP_LANGUAGE_NEGOTIATION_PATH - && ((int)variable_get('language_count', 1) > 1)) { - // Only modify relative (insite) URLs. - if (!$options['external']) { - - // Allow links to bypass the language prefixing. Helpful for simpletest. - // Breaking forms as of 2009-06-22 -// if (isset($options['geoip_language_no_prefix']) && ($options['geoip_language_no_prefix'] === TRUE)) { -// return; +function _geoip_language_url_outbound_alter(&$path, &$options, $original_path) { +// global $language; +// +// if (variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) == GEOIP_LANGUAGE_NEGOTIATION_PATH +// && ((int) variable_get('language_count', 1) > 1)) { +// // Only modify relative (insite) URLs. +// if (!$options['external']) { +// +// // Allow links to bypass the language prefixing. Helpful for simpletest. +// // Breaking forms as of 2009-06-22 +//// if (isset($options['geoip_language_no_prefix']) && ($options['geoip_language_no_prefix'] === TRUE)) { +//// return; +//// } +// +// // Language can be passed as an option, or we go for current language. +// if (!isset($options['language'])) { +// $options['language'] = $language; // } - - // Language can be passed as an option, or we go for current language. - if (!isset($options['language'])) { - $options['language'] = $language; - } - - if (!empty($options['language']->prefix)) { - $options['prefix'] = $options['language']->prefix .'/'; - } - } - } - } +// +// if (!empty($options['language']->prefix)) { +// $options['prefix'] = $options['language']->prefix . '/'; +// } +// } +// } } /** @@ -202,10 +151,15 @@ function geoip_language_mapping_create($country, $language) { 'language' => $language, ); drupal_write_record('geoip_language', $data); - geoip_language_mappings(TRUE); $countries = geoip_country_values(); - watchdog('geoip_language', 'GeoIP mapping created for %country', array('%country' => $countries[$country])); + watchdog( + 'geoip_language', + 'GeoIP mapping created for %country', + array('%country' => $countries[$country]) + ); + + geoip_language_mappings(TRUE); return $data; } @@ -216,11 +170,21 @@ function geoip_language_mapping_create($country, $language) { * @return boolean */ function geoip_language_mapping_delete($country) { - db_query('DELETE FROM {geoip_language} WHERE country="%s"', $country); - geoip_language_mappings(TRUE); + // On error an Exception is thrown + db_delete('geoip_language') + ->condition('country', $country) + ->execute(); $countries = geoip_country_values(); - watchdog('geoip_language', 'GeoIP mapping deleted for %country', array('%country' => $countries[$country])); + watchdog( + 'geoip_language', + 'GeoIP mapping deleted for %country', + array('%country' => $countries[$country]) + ); + + geoip_language_mappings(TRUE); + + return TRUE; } /** @@ -233,13 +197,12 @@ function geoip_language_mapping_delete($country) { * Associative array key=countrycode, value= Language as ISO 639-1 Code */ function geoip_language_mappings($reset = FALSE) { - static $mapping = NULL; + $mapping = drupal_static(__FUNCTION__, NULL); if ($reset || !isset($mapping)) { - $file = file_directory_path() .'/geoip_language.txt'; - if (file_exists($file)) { - $data = unserialize(file_get_contents($file)); - $mapping = isset($data['geoip']) ? $data['geoip'] : NULL; + $data = cache_get(__METHOD__); + if ($data != FALSE) { + $mapping = isset($data->data['geoip']) ? $data->data['geoip'] : NULL; } // Build the mapping array and cache it to the filesystem. @@ -249,14 +212,17 @@ function geoip_language_mappings($reset = FALSE) { 'geoip' => array(), 'default' => language_default('prefix'), ); - $result = db_query('SELECT g.*, l.prefix FROM {geoip_language} g INNER JOIN {languages} l on g.language = l.language ORDER BY g.country ASC'); - while ($row = db_fetch_object($result)) { + $result = db_query( + 'SELECT g.*, l.prefix ' . + 'FROM {geoip_language} g ' . + 'INNER JOIN {languages} l on g.language = l.language ' . + 'ORDER BY g.country ASC' + ); + foreach ($result as $row) { $mapping[$row->country] = $row->language; $data['geoip'][$row->country] = $row; } - - // Add default - $file = file_save_data(serialize($data), 'geoip_language.txt', FILE_EXISTS_REPLACE); + $data = cache_set(__METHOD__, $data); } } @@ -274,24 +240,17 @@ function geoip_language_detect_language($reset = FALSE) { static $geoip_language = NULL; if ($reset || !isset($geoip_language)) { - // Get a list of enabled languages. - $languages = language_list('enabled'); - $languages = $languages[1]; // Get a list of country->language mappings. $mappings = geoip_language_mappings(); // GeoIP detect the current country. $country_code = geoip_country_code(); - // Make sure country_code, the mapping for that country_code, and the enabled - // language for that mapping, all exist. - if ($country_code && $mappings[$country_code] && $languages[$mappings[$country_code]->language]) { - $geoip_language = $languages[$mappings[$country_code]->language]; - } - else { - $geoip_language = language_default(); + // Make sure country_code, the mapping for that country_code, and the + // enabled language for that mapping, all exist. + if ($country_code && isset($mappings[$country_code])) { + $geoip_language = $mappings[$country_code]->language; } } - return $geoip_language; } @@ -304,6 +263,18 @@ function geoip_language_detect_language($reset = FALSE) { function geoip_language_flush_caches() { // Reload the geoip cache file. geoip_language_mappings(TRUE); - return array(); } + +/** + * Implements hook_theme(). + * + * @return array() + */ +function geoip_language_theme() { + return array( + 'geoip_language_mapping_overview' => array( + 'arguments' => array('form' => NULL), + ), + ); +} diff --git a/geoip_language/geoip_language.test b/geoip_language/geoip_language.test index 1ce47a4..33d1fc7 100644 --- a/geoip_language/geoip_language.test +++ b/geoip_language/geoip_language.test @@ -28,7 +28,7 @@ class geoipLanguageTestCase extends DrupalWebTestCase { $this->drupalLogin($this->admin_user); // Make sure default language has a prefix. - $this->drupalPost('admin/settings/language/edit/en', array('prefix' => 'global'), t('Save language')); + $this->drupalPost('admin/config/regional/edit/en', array('prefix' => 'global'), t('Save language')); // Add and map french/france $this->addLanguage('fr'); geoip_language_mapping_create('FR', 'fr'); @@ -51,13 +51,13 @@ class geoipLanguageTestCase extends DrupalWebTestCase { */ function addLanguage($language_code) { // Check to make sure that language has not already been installed. - $this->drupalGet('admin/settings/language'); + $this->drupalGet('admin/config/language'); if (strpos($this->drupalGetContent(), 'enabled[' . $language_code . ']') === FALSE) { // Doesn't have language installed so add it. $edit = array(); $edit['langcode'] = $language_code; - $this->drupalPost('admin/settings/language/add', $edit, t('Add language')); + $this->drupalPost('admin/config/regional/add', $edit, t('Add language')); $languages = language_list('language', TRUE); // Make sure not using cached version. $this->assertTrue(array_key_exists($language_code, $languages), t('%language language was installed successfully.', array('%language' => $languages[$language_code]->name))); @@ -81,12 +81,12 @@ class geoipLanguageTestCase extends DrupalWebTestCase { function testMappingCrud() { $mappings = geoip_language_mappings(TRUE); $this->assertFalse(array_key_exists('US', $mappings), t('No mapping for US')); - $this->drupalPost('admin/settings/language/geoip', array('country' => 'US', 'language' => 'en'), t('Add mapping'), array('language' => $GLOBALS['language'])); + $this->drupalPost('admin/config/regional/language/configure/geoip', array('country' => 'US', 'language' => 'en'), t('Add mapping'), array('language' => $GLOBALS['language'])); $mappings = geoip_language_mappings(TRUE); $this->assertEqual($mappings['US'], 'en', t('Mapping created for US => en')); - $this->drupalPost('admin/settings/language/geoip/delete/US', array(), t('Delete')); + $this->drupalPost('admin/config/regional/language/configure/geoip/delete/US', array(), t('Delete')); $mappings = geoip_language_mappings(TRUE); $this->assertFalse(array_key_exists('US', $mappings), t('US mapping deleted.')); } diff --git a/lib/geoipcity.inc b/lib/geoipcity.inc index 08efe52..4e7b397 100644 --- a/lib/geoipcity.inc +++ b/lib/geoipcity.inc @@ -67,9 +67,9 @@ class geoipdnsrecord { function getrecordwithdnsservice($str){ $record = new geoipdnsrecord; - $keyvalue = split(";",$str); + $keyvalue = explode(";",$str); foreach ($keyvalue as $keyvalue2){ - list($key,$value) = split("=",$keyvalue2); + list($key,$value) = explode("=",$keyvalue2); if ($key == "co"){ $record->country_code = $value; }