Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/m…

…oodle into MOODLE_23_STABLE
  • Loading branch information...
commit 3dd2dce1cb7019516e3aa5f16f1d750ecdaee513 2 parents 1c5f24e + 7e84ef4
Eloy Lafuente (stronk7) stronk7 authored
3  admin/settings/location.php
View
@@ -14,7 +14,8 @@
$temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'admin'), new lang_string('iplookupinfo', 'admin')));
$temp->add(new admin_setting_configfile('geoipfile', new lang_string('geoipfile', 'admin'), new lang_string('configgeoipfile', 'admin', $CFG->dataroot.'/geoip/'), $CFG->dataroot.'/geoip/GeoLiteCity.dat'));
- $temp->add(new admin_setting_configtext('googlemapkey', new lang_string('googlemapkey', 'admin'), new lang_string('configgooglemapkey', 'admin', $CFG->wwwroot), ''));
+ $temp->add(new admin_setting_configtext('googlemapkey', new lang_string('googlemapkey', 'admin'), new lang_string('configgooglemapkey', 'admin', $CFG->wwwroot), '', PARAM_RAW, 60));
+ $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'admin'), new lang_string('googlemapkey3_help', 'admin'), '', PARAM_RAW, 60));
$temp->add(new admin_setting_configtext('allcountrycodes', new lang_string('allcountrycodes', 'admin'), new lang_string('configallcountrycodes', 'admin'), '', '/^(?:\w+(?:,\w+)*)?$/'));
16 iplookup/index.php
View
@@ -80,7 +80,7 @@
$PAGE->set_heading($title);
echo $OUTPUT->header();
-if (empty($CFG->googlemapkey)) {
+if (empty($CFG->googlemapkey) and empty($CFG->googlemapkey3)) {
$imgwidth = 620;
$imgheight = 310;
$dotwidth = 18;
@@ -95,13 +95,25 @@
echo '</div>';
echo '<div id="note">'.$info['note'].'</div>';
-} else {
+} else if (empty($CFG->googlemapkey3)) {
$PAGE->requires->js(new moodle_url("http://maps.google.com/maps?file=api&v=2&key=$CFG->googlemapkey"));
$module = array('name'=>'core_iplookup', 'fullpath'=>'/iplookup/module.js');
$PAGE->requires->js_init_call('M.core_iplookup.init', array($info['latitude'], $info['longitude']), true, $module);
echo '<div id="map" style="width: 650px; height: 360px"></div>';
echo '<div id="note">'.$info['note'].'</div>';
+
+} else {
+ if (strpos($CFG->wwwroot, 'https:') === 0) {
+ $PAGE->requires->js(new moodle_url('https://maps.googleapis.com/maps/api/js', array('key'=>$CFG->googlemapkey3, 'sensor'=>'false')));
+ } else {
+ $PAGE->requires->js(new moodle_url('http://maps.googleapis.com/maps/api/js', array('key'=>$CFG->googlemapkey3, 'sensor'=>'false')));
+ }
+ $module = array('name'=>'core_iplookup', 'fullpath'=>'/iplookup/module.js');
+ $PAGE->requires->js_init_call('M.core_iplookup.init3', array($info['latitude'], $info['longitude'], $ip), true, $module);
+
+ echo '<div id="map" style="width: 650px; height: 360px"></div>';
+ echo '<div id="note">'.$info['note'].'</div>';
}
echo $OUTPUT->footer();
18 iplookup/module.js
View
@@ -41,3 +41,21 @@ M.core_iplookup.init = function(Y, latitude, longitude) {
}, document.body);
}
};
+
+M.core_iplookup.init3 = function(Y, latitude, longitude, ip) {
+ var ipLatlng = new google.maps.LatLng(latitude, longitude);
+
+ var mapOptions = {
+ center: ipLatlng,
+ zoom: 6,
+ mapTypeId: google.maps.MapTypeId.ROADMAP
+ };
+
+ var map = new google.maps.Map(document.getElementById("map"), mapOptions);
+
+ var marker = new google.maps.Marker({
+ position: ipLatlng,
+ map: map,
+ title: ip
+ });
+};
2  lang/en/admin.php
View
@@ -546,6 +546,8 @@
$string['groupenrolmentkeypolicy'] = 'Group enrolment key policy';
$string['groupenrolmentkeypolicy_desc'] = 'Turning this on will make Moodle check group enrolment keys against a valid password policy.';
$string['googlemapkey'] = 'Google Maps API V2 key';
+$string['googlemapkey3'] = 'Google Maps API V3 key';
+$string['googlemapkey3_help'] = 'You need to enter a special key to use Google Maps for IP address lookup visualization. You can obtain the key free of charge at <a href="https://developers.google.com/maps/documentation/javascript/tutorial#api_key" target="_blank">https://developers.google.com/maps/documentation/javascript/tutorial#api_key</a>';
$string['gotofirst'] = 'Go to first missing string';
$string['gradebook'] = 'Gradebook';
$string['gradebookroles'] = 'Graded roles';
Please sign in to comment.
Something went wrong with that request. Please try again.