Merge branch 'master' of https://github.com/XoopsX/gnavi

XoopsX · May 24, 2017 · cfda57c · cfda57c
2 parents e19e094 + 3cdf1b2
commit cfda57c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/html/modules/gnavi/js/map.js b/html/modules/gnavi/js/map.js
@@ -225,12 +225,12 @@ function right_click(){
 		var righticon = {
 			size: new google.maps.Size(31, 27),
 			anchor: new google.maps.Point(8, 27),
-			url: 'http://www.google.com/mapfiles/gadget/arrowSmall80.png'
+			url: 'https://www.google.com/mapfiles/gadget/arrowSmall80.png'
 		};
 		var righticonsh = {
 			size: new google.maps.Size(31, 27),
 			anchor: new google.maps.Point(8, 27),
-			url: 'http://www.google.com/mapfiles/gadget/arrowshadowSmall80.png'
+			url: 'https://www.google.com/mapfiles/gadget/arrowshadowSmall80.png'
 		};
 
 		mypoint = new google.maps.Marker({
@@ -603,8 +603,8 @@ function drawCameraMarker(lat, lng, title){
         position: c,
         map: gn_map,
         title: title + c,
-        icon: 'http://maps.google.com/mapfiles/ms/micons/camera.png',
-        //shadow: 'http://maps.google.com/mapfiles/ms/micons/camera.shadow.png',
+        icon: 'https://maps.google.com/mapfiles/ms/micons/camera.png',
+        //shadow: 'https://maps.google.com/mapfiles/ms/micons/camera.shadow.png',
         draggable: false
     });
 }
@@ -641,7 +641,7 @@ function var_dumpj(mt,cnt,pre){
 	return r;
 }
 
-if (window.File && window.FileReader) {
+if (window.File && window.FileReader && window.JpegMeta) {
 	window.addEventListener('DOMContentLoaded', function(){
 		var $j = this.JpegMeta.JpegFile;
 		var loadFiles = function(elm) {

diff --git a/xoops_trust_path/modules/gnavi/include/common_javalang.inc.php b/xoops_trust_path/modules/gnavi/include/common_javalang.inc.php
@@ -1,7 +1,7 @@
 <?php
 
-$gnavi_googlemap_url="http://maps.google.com";
-//$gnavi_googlemap_url="http://ditu.google.com"; Chinese GoogleMap
+$gnavi_googlemap_url="https://maps.google.com";
+//$gnavi_googlemap_url="https://ditu.google.com"; Chinese GoogleMap
 
 $gnavi_maptypes=array('ROADMAP',
 					'SATELLITE',

diff --git a/xoops_trust_path/modules/gnavi/main/item.php b/xoops_trust_path/modules/gnavi/main/item.php
@@ -127,7 +127,7 @@
 }
 
 if($gnavi_use_rss>0 && $photo['rss']!=""){
-$xoops_module_header .="<script src='http://www.google.com/jsapi?key=$gnavi_googlemapapi_key' type='text/javascript' charset='utf-8'></script>
+$xoops_module_header .="<script src='https://www.google.com/jsapi?key=$gnavi_googlemapapi_key' type='text/javascript' charset='utf-8'></script>
 <script type='text/javascript'>
 //<![CDATA[
 	var gn_feedlink='".$photo['rss']."';

diff --git a/xoops_trust_path/modules/gnavi/xoops_version.php b/xoops_trust_path/modules/gnavi/xoops_version.php
@@ -11,7 +11,7 @@
 
 $modversion['name'] = $mydirname ;
 $modversion['version'] = 1.05 ;
-$modversion['detailed_version'] = '1.05.1' ;
+$modversion['detailed_version'] = '1.05.2' ;
 $modversion['description'] = constant($constpref.'_DESC') ;
 $modversion['credits'] = "Original: GIJOE<br />(http://www.peak.ne.jp/)<br />Daniel Branco<br />(http://bluetopia.homeip.net)<br />Kazumi Ono<br />(http://www.mywebaddons.com/)<br />The XOOPS Project" ;
 $modversion['author'] = "KENTARO (http://xoops.iko-ze.net/)<br />XOOPS X (ten) Distribution Project (https://github.com/XoopsX/gnavi)" ;