Changeset 10551 for extensions/GMaps
- Timestamp:
- Apr 21, 2011, 11:16:43 PM (13 years ago)
- Location:
- extensions/GMaps
- Files:
-
- 3 added
- 3 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/GMaps/admin/gmaps_category_maps.tpl
r7479 r10551 1 { known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}2 { known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js"}3 { known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}4 { known_script id="gpc.ui.iconSelector" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/ui.iconSelector.packed.js"}5 { known_script id="gpc.ui.categorySelector" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/ui.categorySelector.packed.js"}6 { known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 2 {combine_script id="jquery.ui.sortable" path="themes/default/js/ui/minified/jquery.ui.sortable.min.js"} 3 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 4 {combine_script id="gpc.ui.iconSelector" path="plugins/GrumPluginClasses/js/ui.iconSelector.min.js" require="jquery"} 5 {combine_script id="gpc.ui.categorySelector" path="plugins/GrumPluginClasses/js/ui.categorySelector.min.js" require="jquery"} 6 {combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"} 7 7 8 8 {literal} -
extensions/GMaps/admin/gmaps_config.tpl
r7309 r10551 1 { known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}2 { known_script id="jquery.ui.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.slider.packed.js"}1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 2 {combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"} 3 3 4 4 <h2>{'gmaps_config'|@translate}</h2> -
extensions/GMaps/admin/gmaps_kmlfiles.tpl
r7132 r10551 1 { known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}2 { known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js"}3 { known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 2 {combine_script id="jquery.ui.sortable" path="themes/default/js/ui/minified/jquery.ui.sortable.min.js"} 3 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 4 4 5 5 {literal} -
extensions/GMaps/admin/gmaps_maps.tpl
r7309 r10551 1 { known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}2 { known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}3 { known_script id="jquery.ui.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.slider.packed.js"}4 { known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 2 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 3 {combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"} 4 {combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"} 5 5 6 6 <!-- -
extensions/GMaps/gmaps_ajax.php
r7616 r10551 19 19 */ 20 20 21 // in this case, PHPWG_ROOT_PATH must be declared as an absolute path... 21 22 define('PHPWG_ROOT_PATH',dirname(dirname(dirname(__FILE__))).'/'); 22 23 … … 871 872 } 872 873 873 $file=GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY.$file;874 $file=GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file; 874 875 875 876 if(file_exists($file)) unlink($file); … … 877 878 { 878 879 $currentInfo=$this->ajax_gmaps_admin_kmlFilesGetFile($id, false); 879 if(file_exists( self::KML_DIRECTORY.$currentInfo['file'])) unlink(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY.$currentInfo['file']);880 if(file_exists(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file'])) unlink(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file']); 880 881 } 881 882 … … 1008 1009 if($result) 1009 1010 { 1010 if($file!='' and file_exists(GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY.$file))1011 { 1012 unlink(GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY.$file);1011 if($file!='' and file_exists(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file)) 1012 { 1013 unlink(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file); 1013 1014 } 1014 1015 return('ok'); -
extensions/GMaps/gmaps_install.class.inc.php
r7619 r10551 42 42 public function install() 43 43 { 44 if(!file_exists(GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY))44 if(!file_exists(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY)) 45 45 { 46 mkdir(GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY, 0755, true);46 mkdir(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true); 47 47 } 48 48 … … 123 123 public function uninstall() 124 124 { 125 GPCCore::rmDir(dirname(GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY));125 GPCCore::rmDir(dirname(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY)); 126 126 $this->deleteConfig(); 127 127 $this->tablef->drop(); … … 176 176 private function updateFrom_010000() 177 177 { 178 if(!file_exists(GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY))179 mkdir(GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY, 0755, true);178 if(!file_exists(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY)) 179 mkdir(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true); 180 180 181 181 $directory=scandir(GMAPS_PATH.'kml/'); … … 185 185 if(preg_match('/.*(?:\.kml|\.kmz)$/i', $file)) 186 186 { 187 rename(GMAPS_PATH.'kml/'.$file, GPCCore::getPiwigoSystemPath(). self::KML_DIRECTORY.$file);187 rename(GMAPS_PATH.'kml/'.$file, GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY.$file); 188 188 } 189 189 } -
extensions/GMaps/gmaps_pip.class.inc.php
r7616 r10551 126 126 } 127 127 128 GPCCore::addHeaderJS("jquery", "themes/default/js/jquery. packed.js");128 GPCCore::addHeaderJS("jquery", "themes/default/js/jquery.min.js"); 129 129 GPCCore::addHeaderJS("maps.google.com/api", "http://maps.google.com/maps/api/js?sensor=false"); 130 GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup .packed.js");130 GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup".GPCCore::getMinified().".js", array('jquery')); 131 131 132 132 $desc = preg_replace( … … 156 156 while($row=pwg_db_fetch_assoc($result)) 157 157 { 158 $mapParam['kmlUrl']= dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row['file'];158 $mapParam['kmlUrl']=$_SERVER['SCRIPT_URI'].PWG_LOCAL_DIR.self::KML_DIRECTORY.$row['file']; 159 159 } 160 160 } … … 192 192 geolocated:".($nb>0?'true':'false').", 193 193 kmlZoom:".($mapParam['kmlZoom']=='y'?'true':'false').", 194 allowBubble:".($mapParam['allowBubble']=='y'?'true':'false')." ,194 allowBubble:".($mapParam['allowBubble']=='y'?'true':'false')." 195 195 } 196 196 "; … … 204 204 categoryId:".$page['category']['id'].", 205 205 maps: 206 [".implode(',', $scripts)."] ,206 [".implode(',', $scripts)."] 207 207 }; 208 208 </script>", false); … … 263 263 markers:[], 264 264 fitToBounds:true, 265 zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false')." ,265 zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false')." 266 266 }"; 267 267 … … 310 310 maps: 311 311 [".implode(',', $scripts)."], 312 popupAutomaticSize:".$this->config['popupAutomaticSize']." ,312 popupAutomaticSize:".$this->config['popupAutomaticSize']." 313 313 }; 314 314 </script>", false); … … 496 496 { 497 497 latitude:'".$this->picture['coords']['lat']."', 498 longitude:'".$this->picture['coords']['lng']."' ,498 longitude:'".$this->picture['coords']['lng']."' 499 499 }, 500 500 maps: -
extensions/GMaps/gmaps_root.class.inc.php
r7676 r10551 18 18 class GMaps_root extends CommonPlugin 19 19 { 20 const KML_DIRECTORY=' /local/plugins/GMaps/kml/';20 const KML_DIRECTORY='plugins/GMaps/kml/'; 21 21 const ID_MODE_CATEGORY = 'C'; 22 22 const ID_MODE_MAP='M'; … … 274 274 { 275 275 // if an kml file id is given, apply the url of the file (needs to give the complete URI for google) 276 if($row['kmlFileId']>0 and $row['kmlFileUrlId']!='') $row['kmlFileUrl']= dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.rawurlencode($row['kmlFileUrlId']);276 if($row['kmlFileId']>0 and $row['kmlFileUrlId']!='') $row['kmlFileUrl']=$_SERVER['SCRIPT_URI'].PWG_LOCAL_DIR.self::KML_DIRECTORY.rawurlencode($row['kmlFileUrlId']); 277 277 278 278 if($row['displayType']!='MP' and $mode==self::ID_MODE_CATEGORY) -
extensions/GMaps/gmaps_version.inc.php
r7676 r10551 15 15 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 16 16 17 define('GMAPS_VERSION', '1. 2.4');18 define('GMAPS_VERSION2', '01.0 2.04');19 define('GMAPS_GPC_NEEDED', '3. 3.2');20 define('GMAPS_AMD_NEEDED', '0. 5.2'); //advanced metadata plugin is needed17 define('GMAPS_VERSION', '1.3.0'); 18 define('GMAPS_VERSION2', '01.03.00'); 19 define('GMAPS_GPC_NEEDED', '3.5.0'); 20 define('GMAPS_AMD_NEEDED', '0.6.0'); //advanced metadata plugin is needed 21 21 ?> -
extensions/GMaps/js/gmapsCategory.js
r7616 r10551 2 2 * ----------------------------------------------------------------------------- 3 3 * file: gmapsCategory.js 4 * file version: 1.2. 05 * date: 201 0-11-044 * file version: 1.2.1 5 * date: 2011-04-21 6 6 */ 7 7 … … 11 11 { w:32, h:32, x:15, y:31 }, // s02 12 12 { w:32, h:32, x:10, y:31 }, // s03 13 { w:30, h:40, x:4, y:39 } ,// s0413 { w:30, h:40, x:4, y:39 } // s04 14 14 ]; 15 15 … … 39 39 style:properties.mapTypeControl 40 40 }, 41 markerTitle:'' ,41 markerTitle:'' 42 42 } 43 43 ); … … 452 452 { 453 453 autoOpen:false, 454 width: 'auto',454 width:$('#'+gmaps.maps[i].id).width(), 455 455 height:'auto', 456 456 modal: true, -
extensions/GMaps/js/gmapsMarkup.js
r7616 r10551 2 2 * ----------------------------------------------------------------------------- 3 3 * file: gmapsMarkup.js 4 * file version: 1.1. 05 * date: 201 0-11-044 * file version: 1.1.1 5 * date: 2011-04-13 6 6 */ 7 7 … … 11 11 { w:32, h:32, x:15, y:31 }, // s02 12 12 { w:32, h:32, x:10, y:31 }, // s03 13 { w:30, h:40, x:4, y:39 } ,// s0413 { w:30, h:40, x:4, y:39 } // s04 14 14 ]; 15 15 … … 44 44 style:properties.mapTypeControl 45 45 }, 46 markerTitle:'' ,46 markerTitle:'' 47 47 } 48 48 ); … … 134 134 height:map.height, 135 135 distanceTreshold:20, 136 loadIndex:map.gmapsIndex ,136 loadIndex:map.gmapsIndex 137 137 }; 138 138 -
extensions/GMaps/js/gmapsPicture.js
r7500 r10551 2 2 * ----------------------------------------------------------------------------- 3 3 * file: gmapsPicture.js 4 * file version: 1.1. 05 * date: 201 0-10-204 * file version: 1.1.1 5 * date: 2011-04-21 6 6 */ 7 7 … … 16 16 { w:32, h:32, x:15, y:31 }, // s02 17 17 { w:32, h:32, x:10, y:31 }, // s03 18 { w:30, h:40, x:4, y:39 } ,// s0418 { w:30, h:40, x:4, y:39 } // s04 19 19 ]; 20 20 … … 37 37 style:properties.mapTypeControl 38 38 }, 39 markerTitle:'' ,39 markerTitle:'' 40 40 } 41 41 ), … … 181 181 { 182 182 autoOpen:false, 183 width: 'auto',183 width:$('#iGMapsIcon').width(), 184 184 height:'auto', 185 185 modal: true, -
extensions/GMaps/main.inc.php
r7676 r10551 2 2 /* 3 3 Plugin Name: GMaps 4 Version: 1. 2.44 Version: 1.3.0 5 5 Description: Display and manage (google) maps 6 6 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=454 … … 91 91 | | | . MySQL 5.1 incompatibility 92 92 | | | 93 | 1.3.0 | 2011-04-13 | * mantis bug:2148 94 | | | . compatibility with piwigo 2.2 95 | | | 96 | | | * mantis bug:2062 97 | | | . With IE7, comma is not accepted at the end of a JS 98 | | | object 99 | | | 93 100 | | | 94 101 | | | -
extensions/GMaps/templates/gmaps_category.tpl
r7308 r10551 1 { known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}2 { known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}3 { known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}4 { known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}5 { known_script id="gmaps.category" src=$ROOT_URL|@cat:"plugins/GMaps/js/gmapsCategory.packed.js"}1 {combine_script id="jquery" path="themes/default/js/jquery.min.js"} 2 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 3 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 4 {combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"} 5 {combine_script id="gmaps.category" path="plugins/GMaps/js/gmapsCategory.min.js" require="jquery.ui"} 6 6 7 7 {foreach from=$maps item=map} -
extensions/GMaps/templates/gmaps_dialog_area_choose.tpl
r7308 r10551 1 { known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}2 { known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}3 { known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 2 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 3 {combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"} 4 4 5 5 -
extensions/GMaps/templates/gmaps_picture_icon.tpl
r7308 r10551 1 { known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}2 { known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}3 { known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}4 { known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}5 { known_script id="gmaps.picture" src=$ROOT_URL|@cat:"plugins/GMaps/js/gmapsPicture.packed.js"}1 {combine_script id="jquery" path="themes/default/js/jquery.min.js"} 2 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 3 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 4 {combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"} 5 {combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.min.js" require="jquery.ui"} 6 6 7 7 <div id='iGMapsIconContent' style='display:none;'> -
extensions/GMaps/templates/gmaps_picture_meta.tpl
r7176 r10551 1 { known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}2 { known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}3 { known_script id="gmaps.picture" src=$ROOT_URL|@cat:"plugins/GMaps/js/gmapsPicture.packed.js"}1 {combine_script id="jquery" path="themes/default/js/jquery.min.js"} 2 {combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"} 3 {combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.min.js" require="jquery"} 4 4 5 5 <div id='iGMapContent' style='text-align:center;'>
Note: See TracChangeset
for help on using the changeset viewer.