Context Navigation

← Previous Change
Next Change →

Changeset 15432 for extensions/Psli_BingMaps

Timestamp:

May 30, 2012, 7:57:34 AM (12 years ago)

Author:

psli

Message:

Pre-Version 2.0

Location:

extensions/Psli_BingMaps

Files:

: 3 deleted
: 13 edited

JS/Psli-BingMaps.js (modified) (3 diffs)
include/admin.inc.php (deleted)
include/admin.php (deleted)
include/const.inc.php (modified) (2 diffs)
include/guest.inc.php (modified) (5 diffs)
include/version.inc.php (modified) (2 diffs)
language/cs_CZ/plugin.lang.php (modified) (1 diff)
language/de_DE/plugin.lang.php (modified) (1 diff)
language/en_UK/plugin.lang.php (modified) (1 diff)
language/fr_FR/plugin.lang.php (modified) (1 diff)
language/it_IT/plugin.lang.php (modified) (1 diff)
language/pt_PT/plugin.lang.php (modified) (1 diff)
language/ru_RU/plugin.lang.php (modified) (1 diff)
main.inc.php (modified) (4 diffs)
maintain.inc.php (modified) (8 diffs)
template (deleted)

Legend:

: Unmodified
: Added
: Removed

extensions/Psli_BingMaps/JS/Psli-BingMaps.js

-                      r14891
+                      r15432
 Plugin Name: Psli-BingMaps
 Author: psli
-Description: Maintenance function for plugin "Psli-BingMaps"
 */
 …
 /**************************************************************************/
+// JS Function used by admin script while setting up plugin
+function psli_AdminUpdateMap() {
+        psli_g_MapCenter = new Microsoft.Maps.Location(document.getElementById("lat").value, document.getElementById("lon").value);
+        psli_g_zoomInitial = document.getElementById("zoom").value
+        var pin = new Microsoft.Maps.Pushpin(psli_g_MapCenter);
+// JS global function for Map
+function psli_InitMap() {
+        psli_g_Map = new Microsoft.Maps.Map(document.getElementById("myMap"), psli_g_MapOptions);
+        Microsoft.Maps.Events.addHandler(psli_g_Map, "viewchangeend", psli_MapViewChangeEnd);
+        psli_g_Map.setView({center: psli_g_MapCenter, zoom: psli_g_zoomInitial});
+}
+function psli_MapViewChangeEnd () {
         psli_g_Map.entities.clear();
+        psli_g_Map.entities.push(pin);
+        psli_g_Map.entities.push(psli_g_ZoomEntity[psli_g_Map.getZoom() - 1]);
+}
+function psli_InitGuestMap() {
+    psli_g_mode = "guest";
-        psli_g_Map.setView({center: psli_g_MapCenter, zoom: psli_g_zoomInitial});
+}
-function psli_AdminMapClick(e) {
-        if (e.targetType == "map") {
-                var psli_l_Point = new Microsoft.Maps.Point(e.getX(), e.getY());
-                psli_g_MapCenter = e.target.tryPixelToLocation(psli_l_Point);
-                psli_g_zoomInitial = Math.round(psli_g_Map.getZoom());
-                document.getElementById("lat").value = psli_g_MapCenter.latitude;
-                document.getElementById("lon").value = psli_g_MapCenter.longitude;
-                document.getElementById("zoom").value = psli_g_zoomInitial;
-                var pin = new Microsoft.Maps.Pushpin(psli_g_MapCenter);
-                psli_g_Map.entities.clear();
-                psli_g_Map.entities.push(pin);
-                psli_g_Map.setView({center: psli_g_MapCenter, zoom: psli_g_zoomInitial});
+        }
+}
-function psli_InitAdminSetup () {
         psli_g_MapOptions = {
                 credentials: psli_g_BingKey,
 …
         };
+        psli_g_Map = new Microsoft.Maps.Map(document.getElementById("myMap"), psli_g_MapOptions);
+        Microsoft.Maps.Events.addHandler(psli_g_Map, "click", psli_AdminMapClick);
+        var pin = new Microsoft.Maps.Pushpin(psli_g_MapCenter);
+        psli_g_Map.entities.clear();
+        psli_g_Map.entities.push(pin);
+        psli_g_Map.setView({center: psli_g_MapCenter, zoom: psli_g_zoomInitial});
+}
+/**************************************************************************/
+// JS Function used by admin script while editing category location
+function psli_MapsMouseOut (e) {
+         document.getElementById("Coordonates").innerHTML = "";
+}
+function psli_InitGuestMap()
+{
+        psli_g_MapOptions = {
+                credentials: psli_g_BingKey,
+                showDashboard:false,
+                showMapTypeSelector:false,
+                showScalebar:false,
+                mapTypeId: Microsoft.Maps.MapTypeId.road,
+                center: psli_g_MapCenter,
+                zoom: psli_g_zoomInitial
+        };
+        psli_g_Map = new Microsoft.Maps.Map(document.getElementById("myMap"), psli_g_MapOptions);
+        Microsoft.Maps.Events.addHandler(psli_g_Map, "viewchangeend", psli_ViewChangeEnd);
+        psli_InitMap();
         psli_g_Map.entities.clear();
         psli_g_Map.entities.push(psli_g_ZoomEntity[psli_g_zoomInitial - 1]);
+}
+function psli_ViewChangeEnd () {
+        psli_g_Map.entities.clear();
+        psli_g_Map.entities.push(psli_g_ZoomEntity[psli_g_Map.getZoom() - 1]);
+function psli_MapsMouseOut (e) {
+         document.getElementById("Coordonates").innerHTML = "";
+}
-/**************************************************************************/
-// JS Function used by admin script while editing category location
-function psli_CopyInitial() {
-        psli_g_Vertice = new Array();
-        for (var i = 0; i < psli_g_VerticeInitial.length; i++)
+        {
-                psli_g_Vertice.push(psli_g_VerticeInitial[i]);
+        }
+}
-function psli_InitCategoryMap() {
-        if (document.getElementById("pslibingmapsentity").value == "--null--")
+        {
-                document.getElementById("pslibingmapsselect").selectedIndex = 0;
-                psli_g_MapOptions =
-                        {credentials: psli_g_BingKey,
-                         showDashboard:false,
-                         showMapTypeSelector:false,
-                         showScalebar:false,
-                         mapTypeId: Microsoft.Maps.MapTypeId.road,
-                         center: new Microsoft.Maps.Location(0,0),
-                         zoom:2
-                        };
+        }
-        else
+        {
-                document.getElementById("pslibingmapsselect").selectedIndex = document.getElementById("pslibingmapsaction").value;
-                document.getElementById("pslibingmapsbuttonstart").disabled = false;
-                psli_g_MapOptions =
-                        {credentials: psli_g_BingKey,
-                         showDashboard:false,
-                         showMapTypeSelector:false,
-                         showScalebar:false,
-                         mapTypeId: Microsoft.Maps.MapTypeId.road,
-                         center: new Microsoft.Maps.Location(document.getElementById("pslibingmapslat").value, document.getElementById("pslibingmapslon").value),
-                         zoom: parseInt(document.getElementById("pslibingmapsaction").value)
-                        };
+        }
-        psli_g_Map = new Microsoft.Maps.Map(document.getElementById("pslibingmapsmap"), psli_g_MapOptions);
-        Microsoft.Maps.Events.addHandler(psli_g_Map, "click", psli_MapClick);
+}
-function psli_SaveZone() {
-        var psli_l_ZoneCoordonates = ""
-        var psli_l_EntityId = document.getElementById("pslibingmapsentity").value;
-        if (psli_g_Vertice.length > 0)
+        {
-                var psli_l_LastPoint = new Microsoft.Maps.Location(psli_g_Vertice[0].latitude, psli_g_Vertice[0].longitude);
-                psli_g_Vertice.push(psli_l_LastPoint);
-                var psli_l_Polygon = new Microsoft.Maps.Polygon(psli_g_Vertice,{fillColor: psli_g_PolygonColor, strokeColor: psli_g_PolygonColor});
-                psli_g_Map.entities.clear();
-                psli_g_Map.entities.push(psli_l_Polygon);
-                for (var i = 0; i < psli_g_Vertice.length ; i++)
+                {
-                        if (i != 0)
-                                psli_l_ZoneCoordonates += ",";
-                        psli_l_ZoneCoordonates += "(" + psli_l_EntityId + ", " + psli_g_Vertice[i].latitude + ", " + psli_g_Vertice[i].longitude + ")";
+                }
-                psli_l_ZoneCoordonates += ";"
+        }
-        else
+        {
-                psli_l_ZoneCoordonates = "delete all";
+        }
-        document.getElementById("pslibingmapszone").value = psli_l_ZoneCoordonates;
-        document.getElementById("pslibingmapsbuttonall").disabled = true;
-        document.getElementById("pslibingmapsbuttondelete").disabled = true;
-        document.getElementById("pslibingmapsbuttonsave").disabled = true;
-        document.getElementById("pslibingmapsbuttoncancel").disabled = true;
-        document.getElementById("pslibingmapsbuttonstart").disabled = false;
-        psli_g_ZoneDraw = false;
+}
-function psli_CancelZone() {
-        psli_g_ZoneDraw = false;
-        psli_CopyInitial();
-        var psli_l_Polygon = new Microsoft.Maps.Polygon(psli_g_Vertice,{fillColor: psli_g_PolygonColor, strokeColor: psli_g_PolygonColor});
-        psli_g_Map.entities.clear();
-        psli_g_Map.entities.push(psli_l_Polygon);
-        document.getElementById("pslibingmapsbuttonall").disabled = true;
-        document.getElementById("pslibingmapsbuttondelete").disabled = true;
-        document.getElementById("pslibingmapsbuttonsave").disabled = true;
-        document.getElementById("pslibingmapsbuttoncancel").disabled = true;
-        document.getElementById("pslibingmapsbuttonstart").disabled = false;
+}
-function psli_StartZone() {
-        psli_g_ZoneDraw = true;
-        if (psli_g_VerticeInitial.length > 0)
+        {
-                psli_CopyInitial();
-                var psli_l_Polygon = new Microsoft.Maps.Polygon(psli_g_Vertice,{fillColor: psli_g_PolygonColor, strokeColor: psli_g_PolygonColor});
-                psli_g_Map.entities.clear();
-                psli_g_Map.entities.push(psli_l_Polygon);
+        }
-        else
+        {
-                psli_g_Vertice = new Array();
-                psli_g_Map.entities.clear();
+        }
-        document.getElementById("pslibingmapsbuttonall").disabled = false;
-        document.getElementById("pslibingmapsbuttondelete").disabled = false;
-        document.getElementById("pslibingmapsbuttonsave").disabled = false;
-        document.getElementById("pslibingmapsbuttoncancel").disabled = false;
-        document.getElementById("pslibingmapsbuttonstart").disabled = true;
+}
-function psli_DeleteLast() {
-        if (psli_g_Vertice.length > 0)
+        {
-                psli_g_Vertice.pop();
-                var psli_l_Polygon = new Microsoft.Maps.Polygon(psli_g_Vertice,{fillColor: psli_g_PolygonColor, strokeColor: psli_g_PolygonColor});
-                psli_g_Map.entities.clear();
-                psli_g_Map.entities.push(psli_l_Polygon);
+        }
+}
-function psli_DeleteAll() {
-        psli_g_Vertice = new Array();
-        psli_g_Map.entities.clear();
+}
-function psli_SetMinimum() {
-        document.getElementById("pslibingmapszoommin").value = psli_g_Map.getZoom();
+}
-function psli_SetMaximum() {
-        document.getElementById("pslibingmapszoommax").value = psli_g_Map.getZoom();
+}
-function psli_SetAction() {
-        document.getElementById("pslibingmapsselect").selectedIndex = psli_g_Map.getZoom();
+}
-function psli_MapClick(e) {
-        if (e.targetType == "map") {
-                if (psli_g_ZoneDraw)
+                {
-                        var psli_l_Point = new Microsoft.Maps.Point(e.getX(), e.getY());
-                        var psli_l_Loc = e.target.tryPixelToLocation(psli_l_Point);
-                        psli_g_Vertice.push(psli_l_Loc);
-                        var zone = new Microsoft.Maps.Polygon(psli_g_Vertice,{fillColor: psli_g_PolygonColor, strokeColor: psli_g_PolygonColor});
-                        psli_g_Map.entities.clear();
-                        psli_g_Map.entities.push(zone);
+                }
-                else
+                {
-                        var psli_l_Point = new Microsoft.Maps.Point(e.getX(), e.getY());
-                        var psli_l_Loc = e.target.tryPixelToLocation(psli_l_Point);
-                        document.getElementById("pslibingmapslat").value= psli_l_Loc.latitude;
-                        document.getElementById("pslibingmapslon").value= psli_l_Loc.longitude;
-                        document.getElementById("pslibingmapsselect").selectedIndex = psli_g_Map.getZoom();
-                        var pin = new Microsoft.Maps.Pushpin(psli_l_Loc);
-                        psli_g_Map.entities.clear();
-                        psli_g_Map.entities.push(pin);
+                }
+        }
+}

extensions/Psli_BingMaps/include/const.inc.php

-                      r14913
+                      r15432
 /*
 Plugin Name: Psli-BingMaps
+Author: psli
+Description: Define for use by "Psli-Bing Maps" Plugin
+Author: psli
 */
 …
 global $prefixeTable;
-// Define to use Debug Mode
-//if (!defined('PSLI-DEBUG')) define('PSLI-DEBUG', TRUE);
 // Define
+define('PSLI_MAPS_TABLE' , $prefixeTable . 'psli_maps');
 define('PSLI_ENTITIES_TABLE' , $prefixeTable . 'psli_entities');
+define('PSLI_ENTITIES_MAPS_TABLE' , $prefixeTable . 'psli_entities_maps');
 define('PSLI_DATAPOINT_TABLE' , $prefixeTable . 'psli_datapoint');
 define('PSLI_CONF_KEY', 'PsliBingMapsKey');
-define('PSLI_CONF_LAT', 'PsliBingMapsLat');
-define('PSLI_CONF_LON', 'PsliBingMapsLon');
-define('PSLI_CONF_ZOOM', 'PsliBingMapsZoom');
 define('PSLI_CONF_PATH', 'PsliBingMapsPath');
-define('PSLI_CONF_CATEGORY', 'PsliBingMapsCategoryInitiale');
 define('PSLI_CONF_VERSION_MAJ', 'PsliBingMapsVerMaj');
 define('PSLI_CONF_VERSION_MIN', 'PsliBingMapsVerMin');
 define('PSLI_VERSION_MAJ', 1);
 define('PSLI_VERSION_MIN', 3);
+define('PSLI_VERSION_MAJ', 2);
+define('PSLI_VERSION_MIN', 0);
 ?>

extensions/Psli_BingMaps/include/guest.inc.php

-                      r14891
+                      r15432
 Plugin Name: Psli-BingMaps
 Author: psli
-Description: Admin function for plugin "Psli-BingMaps"
 */
 …
 $row = pwg_db_fetch_assoc($result);
 $conf[PSLI_CONF_KEY] = $row['value'];
-$query = '
-        SELECT value
-                FROM '.CONFIG_TABLE.'
-                WHERE param = "'.PSLI_CONF_LAT.'";';
-$result = pwg_query($query);
-$row = pwg_db_fetch_assoc($result);
-$conf[PSLI_CONF_LAT] = $row['value'];
-$query = '
-        SELECT value
-                FROM '.CONFIG_TABLE.'
-                WHERE param = "'.PSLI_CONF_LON.'";';
-$result = pwg_query($query);
-$row = pwg_db_fetch_assoc($result);
-$conf[PSLI_CONF_LON] = $row['value'];
-$query = '
-        SELECT value
-                FROM '.CONFIG_TABLE.'
-                WHERE param = "'.PSLI_CONF_ZOOM.'";';
-$result = pwg_query($query);
-$row = pwg_db_fetch_assoc($result);
-$conf[PSLI_CONF_ZOOM] = $row['value'];
-$query = '
-        SELECT value
-                FROM '.CONFIG_TABLE.'
-                WHERE param = "'.PSLI_CONF_CATEGORY.'";';
-$result = pwg_query($query);
-$row = pwg_db_fetch_assoc($result);
-$conf[PSLI_CONF_CATEGORY] = $row['value'];
 $conf['psli_already_done'] = false;
 …
         if (! (strpos($_SERVER['HTTP_USER_AGENT'],"MSIE 6.0") === FALSE))
                 return $desc;
+        if (isset($page['category']['id']))
+        {
+                $query = '
+                        SELECT id, lat, lon, zoom
+                                FROM '.PSLI_MAPS_TABLE.'
+                                WHERE id_category = '.$page['category']['id'].';';
+                $result = pwg_query($query);
+        }
         // First test album to control availabilty of the map
         if ((isset($page['category']['id'])) and  ($page['category']['id'] == $conf[PSLI_CONF_CATEGORY]) and ($conf['psli_already_done'] == false))
+        if ((isset($page['category']['id'])) and  (pwg_db_num_rows($result) > 0) and ($conf['psli_already_done'] == false))
+        {
+                // Set data for this map
+                $row = pwg_db_fetch_assoc($result);
+                $lon_initiale = $row['lon'];
+                $zoom_initiale = $row['zoom'];
+                $lat_initiale = $row['lat'];
+                $id_initiale = $row['id'];
                 // Language data
                 load_language('plugin.lang', PSLI_BINGMAPS_TEMPLATE_PATH);
 …
 <script>
 psli_g_BingKey = "'.$conf[PSLI_CONF_KEY].'";
 psli_g_zoomInitial = '.$conf[PSLI_CONF_ZOOM].';
 psli_g_MapCenter = new Microsoft.Maps.Location('.$conf[PSLI_CONF_LAT].', '.$conf[PSLI_CONF_LON].')'."\n";
+psli_g_zoomInitial = '.$zoom_initiale.';
+psli_g_MapCenter = new Microsoft.Maps.Location('.$lat_initiale.', '.$lon_initiale.')'."\n";
                 $query_entities = '
+                        SELECT id, lat, lon, zoomMin, zoomMax, action, title, id_category
+                          FROM '.PSLI_ENTITIES_TABLE.';';
+                        SELECT e.id id, lat, lon, zoomMin, zoomMax, action, id_action, title, type
+                          FROM '.PSLI_ENTITIES_TABLE.' e left join '.PSLI_ENTITIES_MAPS_TABLE.' j ON e.id = j.id_entity
+                          WHERE j.id_map = '.$id_initiale.';';
                 $result_entities = pwg_query($query_entities);
 …
                         // For each sub category
                         while ($entity = pwg_db_fetch_assoc($result_entities))
+                        {
+                                $query_datapoint = '
+                                        SELECT lat, lon
+                                                FROM '.PSLI_DATAPOINT_TABLE.'
+                                                WHERE id_entity = '.$entity['id'].' ORDER BY id;';
+                                $result_datapoint = pwg_query($query_datapoint);
+                                if (pwg_db_num_rows($result_datapoint) > 0)
+                                {
+                                        $desc_data .= 'var psli_t_Vertices'.$entity['id'].' = new Array();'."\n";
+                                        while ($row = pwg_db_fetch_assoc($result_datapoint))
+                        {
+                                if ($entity['id_action'] != 0)
+                                {
+                                        if ($entity['type'] == 2)
+                                        {
+                                                $desc_data .= 'psli_t_Vertices'.$entity['id'].'.push(new Microsoft.Maps.Location('.$row['lat'].','.$row['lon'].'));'."\n";
+                                                $query_datapoint = '
+                                                        SELECT lat, lon
+                                                                FROM '.PSLI_DATAPOINT_TABLE.'
+                                                                WHERE id_entity = '.$entity['id'].' ORDER BY id;';
+                                                $result_datapoint = pwg_query($query_datapoint);
+                                                if (pwg_db_num_rows($result_datapoint) > 0)
+                                                {
+                                                        $desc_data .= 'var psli_t_Vertices'.$entity['id'].' = new Array();'."\n";
+                                                        while ($row = pwg_db_fetch_assoc($result_datapoint))
+                                                        {
+                                                                $desc_data .= 'psli_t_Vertices'.$entity['id'].'.push(new Microsoft.Maps.Location('.$row['lat'].','.$row['lon'].'));'."\n";
+                                                        }
+                                                        $desc_data .= '
+var psli_t_Child'.$entity['id'].' = new Microsoft.Maps.Polygon(psli_t_Vertices'.$entity['id'].',{fillColor: psli_g_PolygonColor, strokeColor: psli_g_PolygonColor});'."\n";
+                                                        $desc_function_mouse_over .= '
+function psli_MapsMouseOver_'.$entity['id'].' (e) {
+  document.getElementById("Coordonates").innerHTML = "'.l10n('Click to zoom on')." ".$entity['title'].'";
+}'."\n";
+                                                }
+                                        }
+                                        else
+                                        {
+                                                $desc_data .= '
+var psli_t_Child'.$entity['id'].' = new Microsoft.Maps.Pushpin(new Microsoft.Maps.Location('.$entity['lat'].','.$entity['lon'].'));'."\n";
+                                                $desc_function_mouse_over .= '
+function psli_MapsMouseOver_'.$entity['id'].' (e) {
+  document.getElementById("Coordonates").innerHTML = "'.l10n('Click to show pictures of')." ".$entity['title'].'";
+}'."\n";
+                                        }
                                         $desc_data .= '
+        var psli_t_Child'.$entity['id'].' = new Microsoft.Maps.Polygon(psli_t_Vertices'.$entity['id'].',{fillColor: psli_g_PolygonColor, strokeColor: psli_g_PolygonColor});'."\n";
+                                        $desc_function_mouse_over .= '
+        function psli_MapsMouseOver_'.$entity['id'].' (e) {
+          document.getElementById("Coordonates").innerHTML = "'.l10n('Cliquez pour zoomer sur').$entity['title'].'";
+        }'."\n";
+                                }
+                                else
+                                {
+                                        $desc_data .= '
+        var psli_t_Child'.$entity['id'].' = new Microsoft.Maps.Pushpin(new Microsoft.Maps.Location('.$entity['lat'].','.$entity['lon'].'));'."\n";
+                                        $desc_function_mouse_over .= '
+        function psli_MapsMouseOver_'.$entity['id'].' (e) {
+          document.getElementById("Coordonates").innerHTML = "'.l10n('Cliquez pour acceder aux photos').$entity['title'].'";
+        }'."\n";
+                                }
+Microsoft.Maps.Events.addHandler(psli_t_Child'.$entity['id'].', "mouseover", psli_MapsMouseOver_'.$entity['id'].');
+Microsoft.Maps.Events.addHandler(psli_t_Child'.$entity['id'].', "mouseout", psli_MapsMouseOut);
+Microsoft.Maps.Events.addHandler(psli_t_Child'.$entity['id'].', "click", psli_MapsClick_'.$entity['id'].');'."\n";
+                                        switch ($entity['action'])
+                                        {
+                                                case 1:
+                                                        $desc_function_click .= '
+function psli_MapsClick_'.$entity['id'].' (e) {
+        psli_g_Map.setView({zoom:'.$entity['id_action'].', center: new Microsoft.Maps.Location('.$entity['lat'].', '.$entity['lon'].')});
+}'."\n";
+                                                        break;
+                                                case 2:
+                                                        $desc_function_click .= '
+function psli_MapsClick_'.$entity['id'].' (e) {
+        document.location.href=\'index.php?/category/'.$entity['id_action'].'\';
+}'."\n";
+                                                        break;
+                                                case 3:
+                                                        $desc_function_click .= '
+function psli_MapsClick_'.$entity['id'].' (e) {
+  document.location.href=\'picture.php?/'.$entity['id_action'].'\';
+}'."\n";
+                                                        break;
+                                        }
+                                $desc_data .= '
+        Microsoft.Maps.Events.addHandler(psli_t_Child'.$entity['id'].', "mouseover", psli_MapsMouseOver_'.$entity['id'].');
+        Microsoft.Maps.Events.addHandler(psli_t_Child'.$entity['id'].', "mouseout", psli_MapsMouseOut);
+        Microsoft.Maps.Events.addHandler(psli_t_Child'.$entity['id'].', "click", psli_MapsClick_'.$entity['id'].');'."\n";
+                                if ($entity['action'] == 0)
+                                {
+                                        $desc_function_click .= '
+function psli_MapsClick_'.$entity['id'].' (e) {
+  document.location.href=\'index.php?/category/'.$entity['id_category'].'\';
+}'."\n";
+                                }
+                                else
+                                {
+                                        $desc_function_click .= '
+function psli_MapsClick_'.$entity['id'].' (e) {
+  psli_g_Map.setView({zoom:'.$entity['action'].', center: new Microsoft.Maps.Location('.$entity['lat'].', '.$entity['lon'].')});
+}'."\n";
+                                }
+                                for ($i = $entity['zoomMin']; $i <= $entity['zoomMax']; $i++)
+                                {
+                                        $desc_data .= 'psli_g_ZoomEntity['.($i - 1).'].push(psli_t_Child'.$entity['id'].');'."\n";
+                                        for ($i = $entity['zoomMin']; $i <= $entity['zoomMax']; $i++)
+                                        {
+                                                $desc_data .= 'psli_g_ZoomEntity['.($i - 1).'].push(psli_t_Child'.$entity['id'].');'."\n";
+                                        }
+                                }
+                        }

extensions/Psli_BingMaps/include/version.inc.php

-                      r14913
+                      r15432
 <?php
 /*
-Version: 1.1
 Plugin Name: Psli-BingMaps
 Author: psli
-Description: Maintenance function for plugin "Psli-BingMaps"
 */
 …
+}
+// from version 1.3
+if (($version_maj == "1") and ($version_min == "3"))
+{
+        // New table MAPS and changes in Entities table
+        define('PSLI_CONF_LAT', 'PsliBingMapsLat');
+        define('PSLI_CONF_LON', 'PsliBingMapsLon');
+        define('PSLI_CONF_ZOOM', 'PsliBingMapsZoom');
+        define('PSLI_CONF_CATEGORY', 'PsliBingMapsCategoryInitiale');
+        // Create table Maps and default element
+        $sql = '
+                CREATE TABLE IF NOT EXISTS `'.PSLI_MAPS_TABLE."` (
+                        `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+                        `id_category` smallint(5) unsigned DEFAULT NULL,
+                        `title` text,
+                        `lat` decimal(15,12) DEFAULT '0.000000000000',
+                        `lon` decimal(15,12) DEFAULT '0.000000000000',
+                        `zoom` smallint(6) DEFAULT NULL,
+                        PRIMARY KEY (`id`)
+                ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
+        pwg_query($sql);
+        // Create table Entity-Map and default element
+        $sql = '
+                CREATE TABLE IF NOT EXISTS `'.PSLI_ENTITIES_MAPS_TABLE."` (
+                        `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+                        `id_entity` smallint(5) unsigned DEFAULT NULL,
+                        `id_map` smallint(5) unsigned DEFAULT NULL,
+                        PRIMARY KEY (`id`),
+                        UNIQUE `psli_entity_map_1` (`id_entity`, `id_map`),
+                        INDEX `psli_entity_map_2` (`id_entity`),
+                        INDEX `psli_entity_map_3` (`id_map`)
+                ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
+        pwg_query($sql);
+        $query = '
+                SELECT value
+                        FROM '.CONFIG_TABLE.'
+                        WHERE param = "'.PSLI_CONF_LAT.'";';
+        $result = pwg_query($query);
+        $row = pwg_db_fetch_assoc($result);
+        $lat = $row['value'];
+        $query = '
+                SELECT value
+                        FROM '.CONFIG_TABLE.'
+                        WHERE param = "'.PSLI_CONF_LON.'";';
+        $result = pwg_query($query);
+        $row = pwg_db_fetch_assoc($result);
+        $lon = $row['value'];
+        $query = '
+                SELECT value
+                        FROM '.CONFIG_TABLE.'
+                        WHERE param = "'.PSLI_CONF_ZOOM.'";';
+        $result = pwg_query($query);
+        $row = pwg_db_fetch_assoc($result);
+        $zoom = $row['value'];
+        $query = '
+                SELECT value
+                        FROM '.CONFIG_TABLE.'
+                        WHERE param = "'.PSLI_CONF_CATEGORY.'";';
+        $result = pwg_query($query);
+        $row = pwg_db_fetch_assoc($result);
+        $category = $row['value'];
+        if ($category == 'to define')
+        {
+                $category = 'null';
+        }
+        $sql = "INSERT INTO `".PSLI_MAPS_TABLE."` (`id`, `id_category`, `title`, `lat`, `lon`, `zoom`)
+                                VALUES (1, ".$category.", 'Default', ".$lat.", ".$lon.", ".$zoom.");";
+    pwg_query($sql);
+        $sql = "INSERT INTO `".PSLI_ENTITIES_MAPS_TABLE."` (`id_entity`, `id_map`)
+                                SELECT id, 1 FROM `".PSLI_ENTITIES_TABLE."`;";
+    pwg_query($sql);
+        // Update table Entities
+        $sql = 'ALTER TABLE `'.PSLI_ENTITIES_TABLE.'` DROP INDEX `psli_i10`;';
+    pwg_query($sql);
+        $sql = 'ALTER TABLE `'.PSLI_ENTITIES_TABLE.'` CHANGE COLUMN `id_category` `id_action` smallint(5) unsigned DEFAULT NULL;';
+    pwg_query($sql);
+        $sql = 'ALTER TABLE `'.PSLI_ENTITIES_TABLE.'` ADD COLUMN `type` smallint(1) default 1;';
+    pwg_query($sql);
+        $sql = 'UPDATE `'.PSLI_ENTITIES_TABLE.'` SET `id_action`=`action`, `action`=1 WHERE `action` <> 0;';
+    pwg_query($sql);
+        $sql = 'UPDATE `'.PSLI_ENTITIES_TABLE.'` SET `action`=2 WHERE `action` = 0;';
+    pwg_query($sql);
+        $sql = 'UPDATE '.PSLI_ENTITIES_TABLE.' e SET e.type=2 where exists (select * from '.PSLI_DATAPOINT_TABLE.' d where d.id_entity = e.id);';
+    pwg_query($sql);
+        // Drop conf param PSLI_CONF_LAT, PSLI_CONF_LON, PSLI_CONF_ZOOM
+        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_LAT."';";
+        pwg_query($sql);
+        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_LON."';";
+        pwg_query($sql);
+        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_ZOOM."';";
+        pwg_query($sql);
+        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_CATEGORY."';";
+        pwg_query($sql);
+        // Update version
+        $query = '
+                UPDATE '.CONFIG_TABLE.'
+                        SET value = "' . PSLI_VERSION_MAJ . '"
+                        WHERE param = "'.PSLI_CONF_VERSION_MAJ.'"
+                        LIMIT 1';
+        pwg_query($query);
+        $query = '
+                UPDATE '.CONFIG_TABLE.'
+                        SET value = "' . PSLI_VERSION_MIN . '"
+                        WHERE param = "'.PSLI_CONF_VERSION_MIN.'"
+                        LIMIT 1';
+        pwg_query($query);
+        $version_maj = "2";
+        $version_min = "0";
+}
 ?>

extensions/Psli_BingMaps/language/cs_CZ/plugin.lang.php

-                      r15142
+                      r15432
 // +-----------------------------------------------------------------------+
 $lang['Action'] = 'Akce';
+$lang['Annuler le mode creation'] = 'Zrušit mód perimetru';
+$lang['Action Album'] = 'Action Album';
+$lang['Action Picture'] = 'Action Picture';
+$lang['Action Zoom'] = 'Action Zoom';
+$lang['Added pictures'] = 'Added pictures';
+$lang['Associated map'] = 'Associated map';
+$lang['Batch association'] = 'Batch association';
 $lang['Bing Maps Key'] = 'Bing Maps Key';
+$lang['Categorie'] = 'Kategorie';
+$lang['Category'] = 'Kategorie';
+$lang['Category not selected'] = 'Category not selected';
 $lang['Center Latittude'] = 'Počáteční zeměpisná šířks';
 $lang['Center Longitude'] = 'Počáteční zeměpisná délka';
+$lang['Cliquez pour acceder aux photos'] = 'Kliknout pro pohled';
+$lang['Cliquez pour zoomer sur'] = 'Kliknout k zoom na';
+$lang['Change Zoom Level'] = 'Change Zoom Level';
+$lang['Click to show pictures of'] = 'Kliknout pro pohled';
+$lang['Click to zoom on'] = 'Kliknout k zoom na';
 $lang['Configuration'] = 'Sestava';
+$lang['Contenu'] = 'Ukázat obrázek kategorie';
+$lang['Creer une zone'] = 'Vytvořit perimetr';
+$lang['Enregistrer la zone'] = 'Uložit perimetr';
+$lang['Etes-vous sur ?'] = 'Jste si jist?';
+$lang['Configuration mode'] = 'Configuration mode';
+$lang['Create a map'] = 'Create a map';
+$lang['Create a pin'] = 'Create a pin';
+$lang['Create a zone'] = 'Vytvořit perimetr';
+$lang['Delete all points'] = 'Zrušit vše';
+$lang['Delete last point'] = 'Zrušit poslední bod';
+$lang['Delete this map'] = 'Delete this map';
+$lang['Delete this picture'] = 'Delete this picture';
+$lang['Delete this pin'] = 'Delete this pin';
+$lang['Delete this zone'] = 'Delete this zone';
+$lang['Entity field'] = 'Entity field';
+$lang['Exif import'] = 'Exif import';
+$lang['fifth step : check association with your maps'] = 'fifth step : check association with your maps';
+$lang['first step : create map'] = 'first step : create map';
+$lang['fourth step : make modification to pin associated to your pictures'] = 'fourth step : make modification to pin associated to your pictures';
+$lang['last step : Enjoy !'] = 'last step : Enjoy !';
 $lang['Latitude'] = 'Zeměpisná šířka';
-$lang['Localisation - Plugin Psli-BingMaps'] = 'Lokalizace - Plugin Psli-BingMaps';
 $lang['Longitude'] = 'Zeměpisná délka';
+$lang['PointnClick Map'] = 'Oznčit a kliknout mapu';
+$lang['Map mode'] = 'Map mode';
+$lang['Map Title'] = 'Map Title';
+$lang['Modified pictures'] = 'Modified pictures';
+$lang['New Entity'] = 'New Entity';
+$lang['New Map'] = 'New Map';
+$lang['New Picture'] = 'New Picture';
+$lang['New Pin'] = 'New Pin';
+$lang['New Zone'] = 'New Zone';
+$lang['No exif in pictures for this category'] = 'No exif in pictures for this category';
+$lang['No selected entity'] = 'No selected entity';
+$lang['No selected map'] = 'No selected map';
+$lang['Not assign to a category'] = 'Not assign to a category';
+$lang['Open Category'] = 'Open Category';
+$lang['Open Picture'] = 'Open Picture';
+$lang['Open this category'] = 'Open this category';
+$lang['Open this map'] = 'Open this map';
+$lang['Open this picture'] = 'Open this picture';
+$lang['Open this pin'] = 'Open this pin';
+$lang['Open this zone'] = 'Open this zone';
+$lang['Picture'] = 'Fotografie';
+$lang['Picture mode'] = 'Picture mode';
+$lang['Picture Title'] = 'Picture Title';
+$lang['pictures'] = 'Fotografie';
+$lang['Pin'] = 'Pin';
+$lang['Pin mode'] = 'Pin mode';
+$lang['Pin Title'] = 'Pin Title';
+$lang['Reload saved zone'] = 'Reload saved zone';
+$lang['second step : import exif data from your pictures'] = 'second step : import exif data from your pictures';
+$lang['Select a Category'] = 'Select a Category';
+$lang['Select a Map'] = 'Select a Map';
+$lang['Select a picture'] = 'Select a picture';
+$lang['Select a pin'] = 'Select a pin';
+$lang['Select a zone'] = 'Select a zone';
 $lang['Set'] = 'Nastavit';
+$lang['Setup Helper'] = 'Použít mapu k nastavení počáteční středové pozice a hladiny zoomu mapy';
+$lang['Submit'] = 'Uložit';
+$lang['Supprimer la localisation'] = 'Zrušit všechny údaje';
+$lang['Supprimer le dernier point'] = 'Zrušit poslední bod';
+$lang['Tout effacer'] = 'Zrušit vše';
+$lang['Valider'] = 'Vyhradit';
+$lang['Show guest view'] = 'Show guest view';
+$lang['Show map center'] = 'Show map center';
+$lang['third step : create new zone and new pin'] = 'third step : create new zone and new pin';
+$lang['User manual'] = 'Uživatelská příručka';
+$lang['You need to select a category'] = 'You need to select a category';
+$lang['You need to select a map'] = 'You need to select a map';
+$lang['You need to select a picture'] = 'You need to select a picture';
+$lang['You need to select a pin'] = 'You need to select a pin';
+$lang['You need to select a zone'] = 'You need to select a zone';
+$lang['Zone'] = 'Perimetr';
+$lang['Zone mode'] = 'Zone mode';
+$lang['Zone Title'] = 'Zone Title';
+$lang['Zoom'] = 'Počáteční zoom';
+$lang['Zoom level 1'] = 'Zoom na hladinu 1';
+$lang['Zoom level 10'] = 'Zoom na hladinu 10';
+$lang['Zoom level 11'] = 'Zoom na hladinu 11';
+$lang['Zoom level 12'] = 'Zoom na hladinu 12';
+$lang['Zoom level 13'] = 'Zoom na hladinu 13';
+$lang['Zoom level 14'] = 'Zoom na hladinu 14';
+$lang['Zoom level 15'] = 'Zoom na hladinu 15';
+$lang['Zoom level 16'] = 'Zoom na hladinu 16';
+$lang['Zoom level 17'] = 'Zoom na hladinu 17';
+$lang['Zoom level 18'] = 'Zoom na hladinu 18';
+$lang['Zoom level 19'] = 'Zoom na hladinu 19';
+$lang['Zoom level 2'] = 'Zoom na hladinu 2';
+$lang['Zoom level 20'] = 'Zoom na hladinu 20';
+$lang['Zoom level 3'] = 'Zoom na hladinu 3';
+$lang['Zoom level 4'] = 'Zoom na hladinu 4';
+$lang['Zoom level 5'] = 'Zoom na hladinu 5';
+$lang['Zoom level 6'] = 'Zoom na hladinu 6';
+$lang['Zoom level 7'] = 'Zoom na hladinu 7';
+$lang['Zoom level 8'] = 'Zoom na hladinu 8';
+$lang['Zoom level 9'] = 'Zoom na hladinu 9';
 $lang['Zoom maximum'] = 'Maximální zoom';
 $lang['Zoom minimum'] = 'Minimální zoom';
-$lang['Zoom niveau 10'] = 'Zoom na hladinu 10';
-$lang['Zoom niveau 11'] = 'Zoom na hladinu 11';
-$lang['Zoom niveau 12'] = 'Zoom na hladinu 12';
-$lang['Zoom niveau 13'] = 'Zoom na hladinu 13';
-$lang['Zoom niveau 14'] = 'Zoom na hladinu 14';
-$lang['Zoom niveau 15'] = 'Zoom na hladinu 15';
-$lang['Zoom niveau 16'] = 'Zoom na hladinu 16';
-$lang['Zoom niveau 17'] = 'Zoom na hladinu 17';
-$lang['Zoom niveau 18'] = 'Zoom na hladinu 18';
-$lang['Zoom niveau 19'] = 'Zoom na hladinu 19';
-$lang['Zoom niveau 1'] = 'Zoom na hladinu 1';
-$lang['Zoom niveau 20'] = 'Zoom na hladinu 20';
-$lang['Zoom niveau 2'] = 'Zoom na hladinu 2';
-$lang['Zoom niveau 3'] = 'Zoom na hladinu 3';
-$lang['Zoom niveau 4'] = 'Zoom na hladinu 4';
-$lang['Zoom niveau 5'] = 'Zoom na hladinu 5';
-$lang['Zoom niveau 6'] = 'Zoom na hladinu 6';
-$lang['Zoom niveau 7'] = 'Zoom na hladinu 7';
-$lang['Zoom niveau 8'] = 'Zoom na hladinu 8';
-$lang['Zoom niveau 9'] = 'Zoom na hladinu 9';
-$lang['Zoom'] = 'Počáteční zoom';
 ?>

extensions/Psli_BingMaps/language/de_DE/plugin.lang.php

-                      r14917
+                      r15432
 // +-----------------------------------------------------------------------+
 $lang['Action'] = 'Aktion';
+$lang['Annuler le mode creation'] = 'Perimeter-Modus aufheben';
+$lang['Action Album'] = 'Action Album';
+$lang['Action Picture'] = 'Action Picture';
+$lang['Action Zoom'] = 'Action Zoom';
+$lang['Added pictures'] = 'Added pictures';
+$lang['Associated map'] = 'Associated map';
+$lang['Batch association'] = 'Batch association';
 $lang['Bing Maps Key'] = 'Bing Maps Key';
+$lang['Categorie'] = 'Kategorie';
+$lang['Category'] = 'Kategorie';
+$lang['Category not selected'] = 'Category not selected';
 $lang['Center Latittude'] = 'Ab der Breite';
 $lang['Center Longitude'] = 'Ab der Länge';
+$lang['Cliquez pour acceder aux photos'] = 'Klicken Sie um auf die Fotos zugreifen zu können';
+$lang['Cliquez pour zoomer sur'] = 'Klicken Sie, um zu vergrößern';
+$lang['Change Zoom Level'] = 'Change Zoom Level';
+$lang['Click to show pictures of'] = 'Klicken Sie um auf die Fotos zugreifen zu können';
+$lang['Click to zoom on'] = 'Klicken Sie, um zu vergrößern';
 $lang['Configuration'] = 'Einstellungen';
+$lang['Contenu'] = 'Kategoriebild anzeigen';
+$lang['Creer une zone'] = 'Perimeter erstellen';
+$lang['Enregistrer la zone'] = 'Perimeter speichern';
+$lang['Etes-vous sur ?'] = 'Sind Sie sicher?';
+$lang['Configuration mode'] = 'Configuration mode';
+$lang['Create a map'] = 'Create a map';
+$lang['Create a pin'] = 'Create a pin';
+$lang['Create a zone'] = 'Perimeter erstellen';
+$lang['Delete all points'] = 'Alles Entfernen';
+$lang['Delete last point'] = 'Letzter Punkt löschen';
+$lang['Delete this map'] = 'Delete this map';
+$lang['Delete this picture'] = 'Delete this picture';
+$lang['Delete this pin'] = 'Delete this pin';
+$lang['Delete this zone'] = 'Delete this zone';
+$lang['Entity field'] = 'Entity field';
+$lang['Exif import'] = 'Exif import';
+$lang['fifth step : check association with your maps'] = 'fifth step : check association with your maps';
+$lang['first step : create map'] = 'first step : create map';
+$lang['fourth step : make modification to pin associated to your pictures'] = 'fourth step : make modification to pin associated to your pictures';
+$lang['last step : Enjoy !'] = 'last step : Enjoy !';
 $lang['Latitude'] = 'Breite';
-$lang['Localisation - Plugin Psli-BingMaps'] = 'Lokalisation - Plugin Psli-BingMaps';
 $lang['Longitude'] = 'Länge';
+$lang['PointnClick Map'] = 'Point and Click Karte';
+$lang['Map mode'] = 'Map mode';
+$lang['Map Title'] = 'Map Title';
+$lang['Modified pictures'] = 'Modified pictures';
+$lang['New Entity'] = 'New Entity';
+$lang['New Map'] = 'New Map';
+$lang['New Picture'] = 'New Picture';
+$lang['New Pin'] = 'New Pin';
+$lang['New Zone'] = 'New Zone';
+$lang['No exif in pictures for this category'] = 'No exif in pictures for this category';
+$lang['No selected entity'] = 'No selected entity';
+$lang['No selected map'] = 'No selected map';
+$lang['Not assign to a category'] = 'Not assign to a category';
+$lang['Open Category'] = 'Open Category';
+$lang['Open Picture'] = 'Open Picture';
+$lang['Open this category'] = 'Open this category';
+$lang['Open this map'] = 'Open this map';
+$lang['Open this picture'] = 'Open this picture';
+$lang['Open this pin'] = 'Open this pin';
+$lang['Open this zone'] = 'Open this zone';
+$lang['Picture'] = 'Picture';
+$lang['Picture mode'] = 'Picture mode';
+$lang['Picture Title'] = 'Picture Title';
+$lang['pictures'] = 'pictures';
+$lang['Pin'] = 'Pin';
+$lang['Pin mode'] = 'Pin mode';
+$lang['Pin Title'] = 'Pin Title';
+$lang['Reload saved zone'] = 'Reload saved zone';
+$lang['second step : import exif data from your pictures'] = 'second step : import exif data from your pictures';
+$lang['Select a Category'] = 'Select a Category';
+$lang['Select a Map'] = 'Select a Map';
+$lang['Select a picture'] = 'Select a picture';
+$lang['Select a pin'] = 'Select a pin';
+$lang['Select a zone'] = 'Select a zone';
 $lang['Set'] = 'Set';
+$lang['Setup Helper'] = 'Benutzen Sie die Karte um die anfängliche mittlere Position und den Zoomfaktor der Karte festlegen.';
+$lang['Submit'] = 'Speichern';
+$lang['Supprimer la localisation'] = 'Alle Daten löschen';
+$lang['Supprimer le dernier point'] = 'Letzter Punkt löschen';
+$lang['Tout effacer'] = 'Alles Entfernen';
+$lang['Valider'] = 'Einreichen';
+$lang['Zoom maximum'] = 'Maximaler Zoom';
+$lang['Zoom minimum'] = 'Minimaler Zoom';
+$lang['Zoom niveau 10'] = 'Auf Level 10 zoomen';
+$lang['Zoom niveau 11'] = 'Auf Level 11 zoomen';
+$lang['Zoom niveau 12'] = 'Auf Level 12 zoomen';
+$lang['Zoom niveau 13'] = 'Auf Level 13 zoomen';
+$lang['Zoom niveau 14'] = 'Auf Level 14 zoomen';
+$lang['Zoom niveau 15'] = 'Auf Level 15 zoomen';
+$lang['Zoom niveau 16'] = 'Auf Level 16 zoomen';
+$lang['Zoom niveau 17'] = 'Auf Level 17 zoomen';
+$lang['Zoom niveau 18'] = 'Auf Level 18 zoomen';
+$lang['Zoom niveau 19'] = 'Auf Level 19 zoomen';
+$lang['Zoom niveau 1'] = 'Auf Level 1 zoomen';
+$lang['Zoom niveau 20'] = 'Auf Level 20 zoomen';
+$lang['Zoom niveau 2'] = 'Auf Level 2 zoomen';
+$lang['Zoom niveau 3'] = 'Auf Level 3 zoomen';
+$lang['Zoom niveau 4'] = 'Auf Level 4 zoomen';
+$lang['Zoom niveau 5'] = 'Auf Level 5 zoomen';
+$lang['Zoom niveau 6'] = 'Auf Level 6 zoomen';
+$lang['Zoom niveau 7'] = 'Auf Level 7 zoomen';
+$lang['Zoom niveau 8'] = 'Auf Level 8 zoomen';
+$lang['Zoom niveau 9'] = 'Auf Level 9 zoomen';
+$lang['Show guest view'] = 'Show guest view';
+$lang['Show map center'] = 'Show map center';
+$lang['third step : create new zone and new pin'] = 'third step : create new zone and new pin';
+$lang['User manual'] = 'User manual';
+$lang['You need to select a category'] = 'You need to select a category';
+$lang['You need to select a map'] = 'You need to select a map';
+$lang['You need to select a picture'] = 'You need to select a picture';
+$lang['You need to select a pin'] = 'You need to select a pin';
+$lang['You need to select a zone'] = 'You need to select a zone';
+$lang['Zone'] = 'Zone';
+$lang['Zone mode'] = 'Zone mode';
+$lang['Zone Title'] = 'Zone Title';
 $lang['Zoom'] = 'Ab dem Zoom';
+$lang['Zoom level 1'] = 'Auf Level 1 zoomen';
+$lang['Zoom level 10'] = 'Auf Level 10 zoomen';
+$lang['Zoom level 11'] = 'Auf Level 11 zoomen';
+$lang['Zoom level 12'] = 'Auf Level 12 zoomen';
+$lang['Zoom level 13'] = 'Auf Level 13 zoomen';
+$lang['Zoom level 14'] = 'Auf Level 14 zoomen';
+$lang['Zoom level 15'] = 'Auf Level 15 zoomen';
+$lang['Zoom level 16'] = 'Auf Level 16 zoomen';
+$lang['Zoom level 17'] = 'Auf Level 17 zoomen';
+$lang['Zoom level 18'] = 'Auf Level 18 zoomen';
+$lang['Zoom level 19'] = 'Auf Level 19 zoomen';
+$lang['Zoom level 2'] = 'Auf Level 2 zoomen';
+$lang['Zoom level 20'] = 'Auf Level 20 zoomen';
+$lang['Zoom level 3'] = 'Auf Level 3 zoomen';
+$lang['Zoom level 4'] = 'Auf Level 4 zoomen';
+$lang['Zoom level 5'] = 'Auf Level 5 zoomen';
+$lang['Zoom level 6'] = 'Auf Level 6 zoomen';
+$lang['Zoom level 7'] = 'Auf Level 7 zoomen';
+$lang['Zoom level 8'] = 'Auf Level 8 zoomen';
+$lang['Zoom level 9'] = 'Auf Level 9 zoomen';
+$lang['Zoom maximum'] = 'Minimaler Zoom';
+$lang['Zoom minimum'] = 'Maximaler Zoom';
 ?>

extensions/Psli_BingMaps/language/en_UK/plugin.lang.php

-                      r14891
+                      r15432
 <?php
+$lang['Setup Helper'] = 'Use the map to set initial center position and zoom level of the map.';
+$lang['PointnClick Map'] = 'Point and Click map';
+$lang['Localisation - Plugin Psli-BingMaps'] = 'Localisation - Plugin Psli-BingMaps';
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+$lang['Action'] = 'Action';
+$lang['Action Album'] = 'Action Album';
+$lang['Action Picture'] = 'Action Picture';
+$lang['Action Zoom'] = 'Action Zoom';
+$lang['Added pictures'] = 'Added pictures';
+$lang['Associated map'] = 'Associated map';
+$lang['Batch association'] = 'Batch association';
+$lang['Bing Maps Key'] = 'Bing Maps Key';
+$lang['Category'] = 'Category';
+$lang['Category not selected'] = 'Category not selected';
+$lang['Center Latittude'] = 'Center Latittude';
+$lang['Center Longitude'] = 'Center Longitude';
+$lang['Change Zoom Level'] = 'Change Zoom Level';
+$lang['Click to show pictures of'] = 'Click to show pictures of';
+$lang['Click to zoom on'] = 'Click to zoom on';
+$lang['Configuration'] = 'Configuration';
+$lang['Configuration mode'] = 'Configuration mode';
+$lang['Create a map'] = 'Create a map';
+$lang['Create a pin'] = 'Create a pin';
+$lang['Create a zone'] = 'Create a zone';
+$lang['Delete all points'] = 'Delete all points';
+$lang['Delete last point'] = 'Delete last point';
+$lang['Delete this map'] = 'Delete this map';
+$lang['Delete this picture'] = 'Delete this picture';
+$lang['Delete this pin'] = 'Delete this pin';
+$lang['Delete this zone'] = 'Delete this zone';
+$lang['Entity field'] = 'Entity field';
+$lang['Exif import'] = 'Exif import';
+$lang['fifth step : check association with your maps'] = 'Fifth step : check associations with your maps';
+$lang['first step : create map'] = 'First step : create map';
+$lang['fourth step : make modification to pin associated to your pictures'] = 'Fourth step : make modifications to pin associated to your pictures';
+$lang['last step : Enjoy !'] = 'Last step : Enjoy !';
 $lang['Latitude'] = 'Latitude';
 $lang['Longitude'] = 'Longitude';
+$lang['Creer une zone'] = 'Create perimeter';
+$lang['Supprimer le dernier point'] = 'Delete last point';
+$lang['Enregistrer la zone'] = 'Save perimeter';
+$lang['Tout effacer'] = 'Remove all';
+$lang['Map mode'] = 'Map mode';
+$lang['Map Title'] = 'Map Title';
+$lang['Modified pictures'] = 'Modified pictures';
+$lang['New Entity'] = 'New Entity';
+$lang['New Map'] = 'New Map';
+$lang['New Picture'] = 'New Picture';
+$lang['New Pin'] = 'New Pin';
+$lang['New Zone'] = 'New Zone';
+$lang['No exif in pictures for this category'] = 'No exif in pictures in this category';
+$lang['No selected entity'] = 'No selected entity';
+$lang['No selected map'] = 'No selected map';
+$lang['Not assign to a category'] = 'Not assign to a category';
+$lang['Open Category'] = 'Open Category';
+$lang['Open Picture'] = 'Open Picture';
+$lang['Open this category'] = 'Open this category';
+$lang['Open this map'] = 'Open this map';
+$lang['Open this picture'] = 'Open this picture';
+$lang['Open this pin'] = 'Open this pin';
+$lang['Open this zone'] = 'Open this zone';
+$lang['Picture'] = 'Picture';
+$lang['Picture mode'] = 'Picture mode';
+$lang['Picture Title'] = 'Picture Title';
+$lang['pictures'] = 'pictures';
+$lang['Pin'] = 'Pin';
+$lang['Pin mode'] = 'Pin mode';
+$lang['Pin Title'] = 'Pin Title';
+$lang['Reload saved zone'] = 'Reload saved zone';
+$lang['second step : import exif data from your pictures'] = 'Second step : import exif data from your pictures';
+$lang['Select a Category'] = 'Select a Category';
+$lang['Select a Map'] = 'Select a Map';
+$lang['Select a picture'] = 'Select a picture';
+$lang['Select a pin'] = 'Select a pin';
+$lang['Select a zone'] = 'Select a zone';
+$lang['Set'] = 'Set';
+$lang['Show guest view'] = 'Show guest view';
+$lang['Show map center'] = 'Show map center';
+$lang['third step : create new zone and new pin'] = 'third step : create new zone and new pin';
+$lang['User manual'] = 'User manual';
+$lang['You need to select a category'] = 'You need to select a category';
+$lang['You need to select a map'] = 'You need to select a map';
+$lang['You need to select a picture'] = 'You need to select a picture';
+$lang['You need to select a pin'] = 'You need to select a pin';
+$lang['You need to select a zone'] = 'You need to select a zone';
+$lang['Zone'] = 'Zone';
+$lang['Zone mode'] = 'Zone mode';
+$lang['Zone Title'] = 'Zone Title';
+$lang['Zoom'] = 'Zoom';
+$lang['Zoom level 1'] = 'Zoom to level 1';
+$lang['Zoom level 10'] = 'Zoom to level 10';
+$lang['Zoom level 11'] = 'Zoom to level 11';
+$lang['Zoom level 12'] = 'Zoom to level 12';
+$lang['Zoom level 13'] = 'Zoom to level 13';
+$lang['Zoom level 14'] = 'Zoom to level 14';
+$lang['Zoom level 15'] = 'Zoom to level 15';
+$lang['Zoom level 16'] = 'Zoom to level 16';
+$lang['Zoom level 17'] = 'Zoom to level 17';
+$lang['Zoom level 18'] = 'Zoom to level 18';
+$lang['Zoom level 19'] = 'Zoom to level 19';
+$lang['Zoom level 2'] = 'Zoom to level 2';
+$lang['Zoom level 20'] = 'Zoom to level 20';
+$lang['Zoom level 3'] = 'Zoom to level 3';
+$lang['Zoom level 4'] = 'Zoom to level 4';
+$lang['Zoom level 5'] = 'Zoom to level 5';
+$lang['Zoom level 6'] = 'Zoom to level 6';
+$lang['Zoom level 7'] = 'Zoom to level 7';
+$lang['Zoom level 8'] = 'Zoom to level 8';
+$lang['Zoom level 9'] = 'Zoom to level 9';
+$lang['Zoom maximum'] = 'Zoom maximum';
 $lang['Zoom minimum'] = 'Zoom minimum';
-$lang['Zoom maximum'] = 'Zoom maximum';
-$lang['Annuler le mode creation'] = 'Cancel perimeter mode';
-$lang['Set'] = 'Set';
-$lang['Action'] = 'Action';
-$lang['Contenu'] = "Show category picture";
-$lang['Zoom niveau 1'] = 'Zoom to level 1';
-$lang['Zoom niveau 2'] = 'Zoom to level 2';
-$lang['Zoom niveau 3'] = 'Zoom to level 3';
-$lang['Zoom niveau 4'] = 'Zoom to level 4';
-$lang['Zoom niveau 5'] = 'Zoom to level 5';
-$lang['Zoom niveau 6'] = 'Zoom to level 6';
-$lang['Zoom niveau 7'] = 'Zoom to level 7';
-$lang['Zoom niveau 8'] = 'Zoom to level 8';
-$lang['Zoom niveau 9'] = 'Zoom to level 9';
-$lang['Zoom niveau 10'] = 'Zoom to level 10';
-$lang['Zoom niveau 11'] = 'Zoom to level 11';
-$lang['Zoom niveau 12'] = 'Zoom to level 12';
-$lang['Zoom niveau 13'] = 'Zoom to level 13';
-$lang['Zoom niveau 14'] = 'Zoom to level 14';
-$lang['Zoom niveau 15'] = 'Zoom to level 15';
-$lang['Zoom niveau 16'] = 'Zoom to level 16';
-$lang['Zoom niveau 17'] = 'Zoom to level 17';
-$lang['Zoom niveau 18'] = 'Zoom to level 18';
-$lang['Zoom niveau 19'] = 'Zoom to level 19';
-$lang['Zoom niveau 20'] = 'Zoom to level 20';
-$lang['Supprimer la localisation'] = 'Delete all data';
-$lang['Etes-vous sur ?'] = 'Are you sure ?';
-$lang['Valider'] = 'Commit';
-$lang['Configuration'] = 'Setup';
-$lang['Bing Maps Key'] = 'Bing Maps Key';
-$lang['Center Latittude'] = 'Starting Latitude';
-$lang['Center Longitude'] = 'Starting Longitude';
-$lang['Zoom'] = 'Starting Zoom';
-$lang['Categorie'] = 'Category';
-$lang['Submit'] = 'Save';
-$lang['Cliquez pour zoomer sur'] = 'Click to zoom to ';
-$lang['Cliquez pour acceder aux photos'] = 'Click to view ';
 ?>

extensions/Psli_BingMaps/language/fr_FR/plugin.lang.php

-                      r14891
+                      r15432
 <?php
+$lang['Setup Helper'] = 'Utilisez la carte ci-dessous pour d&eacute;finir la position et le niveau de zoom initial de la carte.';
+$lang['PointnClick Map'] = 'Carte';
+$lang['Localisation - Plugin Psli-BingMaps'] = 'Localisation - Plugin Psli-BingMaps';
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+$lang['Action'] = 'Action';
+$lang['Action Album'] = 'Album a ouvrir';
+$lang['Action Picture'] = 'Photo a afficher';
+$lang['Action Zoom'] = 'Niveau de zoom cible';
+$lang['Added pictures'] = 'Photos ajoutees';
+$lang['Associated map'] = 'Cartes associees';
+$lang['Batch association'] = 'Association en masse';
+$lang['Bing Maps Key'] = 'Bing Maps Key';
+$lang['Category'] = 'Albums';
+$lang['Category not selected'] = 'Album non selectionne';
+$lang['Center Latittude'] = 'Latitude du centre';
+$lang['Center Longitude'] = 'Longitude du centre';
+$lang['Change Zoom Level'] = 'Modifier le niveau de zoom';
+$lang['Click to show pictures of'] = 'Cliquez pour afficher les photos de';
+$lang['Click to zoom on'] = 'Cliquez pour zoomer sur';
+$lang['Configuration'] = 'Configuration';
+$lang['Configuration mode'] = 'Configuration';
+$lang['Create a map'] = 'Creer une carte';
+$lang['Create a pin'] = 'Creer un POI';
+$lang['Create a zone'] = 'Creer une zone';
+$lang['Delete all points'] = 'Supprimer tous les points';
+$lang['Delete last point'] = 'Supprimer le dernier point';
+$lang['Delete this map'] = 'Supprimer cette carte';
+$lang['Delete this picture'] = 'Supprimer cette photo';
+$lang['Delete this pin'] = 'Supprimer ce POI';
+$lang['Delete this zone'] = 'Supprimer cette zone';
+$lang['Entity field'] = 'Entity field';
+$lang['Exif import'] = 'Import des donnees EXIF';
+$lang['fifth step : check association with your maps'] = 'Cinquieme etape : verifiez l\'association avec vos cartes';
+$lang['first step : create map'] = 'Premiere etape : creez les cartes';
+$lang['fourth step : make modification to pin associated to your pictures'] = 'Quatrieme etape : modifier les informations liees aux photos contenant des donnees exifs';
+$lang['last step : Enjoy !'] = 'Derniere etape : Profitez de la carte !';
 $lang['Latitude'] = 'Latitude';
 $lang['Longitude'] = 'Longitude';
+$lang['Creer une zone'] = 'Creer une zone';
+$lang['Supprimer le dernier point'] = 'Supprimer le dernier point';
+$lang['Enregistrer la zone'] = 'Enregistrer la zone';
+$lang['Tout effacer'] = 'Tout effacer';
+$lang['Map mode'] = 'Gestion des cartes';
+$lang['Map Title'] = 'Titre de la carte';
+$lang['Modified pictures'] = 'Photos modifiees';
+$lang['New Entity'] = 'Nouvelle entite';
+$lang['New Map'] = 'Nouvelle carte';
+$lang['New Picture'] = 'Nouvelle photo';
+$lang['New Pin'] = 'Nouveau POI';
+$lang['New Zone'] = 'Nouvelle zone';
+$lang['No exif in pictures for this category'] = 'Aucune photos avec informations EXIF dans cet album';
+$lang['No selected entity'] = 'Aucune entite selectionnee';
+$lang['No selected map'] = 'Aucune carte selectionnee';
+$lang['Not assign to a category'] = 'Aucun album associe';
+$lang['Open Category'] = 'Ouvrir un album';
+$lang['Open Picture'] = 'Ouvrir une photo';
+$lang['Open this category'] = 'Ouvrir l\'album';
+$lang['Open this map'] = 'Ouvrir cette carte';
+$lang['Open this picture'] = 'Ouvrir la photo';
+$lang['Open this pin'] = 'Ouvrir ce POI';
+$lang['Open this zone'] = 'Ouvrir cette zone';
+$lang['Picture'] = 'Photo';
+$lang['Picture mode'] = 'Gestion des photos geolocalisees';
+$lang['Picture Title'] = 'Titre de la photo';
+$lang['pictures'] = 'Photos';
+$lang['Pin'] = 'POI';
+$lang['Pin mode'] = 'Gestion des POI';
+$lang['Pin Title'] = 'Titre du POI';
+$lang['Reload saved zone'] = 'Recharger la zone';
+$lang['second step : import exif data from your pictures'] = 'Deuxieme etape : importer les informations EXIF de vos photos';
+$lang['Select a Category'] = 'Selectionnez un album';
+$lang['Select a Map'] = 'Selectionnez une carte';
+$lang['Select a picture'] = 'Selectionnez une image';
+$lang['Select a pin'] = 'Selectionnez un POI';
+$lang['Select a zone'] = 'Selectionnez une zone';
+$lang['Set'] = 'Assigner';
+$lang['Show guest view'] = 'Previsualiser la carte';
+$lang['Show map center'] = 'Gerer le centre de la carte';
+$lang['third step : create new zone and new pin'] = 'Troisieme etape : creez des zones et POI';
+$lang['User manual'] = 'Guide d\'utilisation';
+$lang['You need to select a category'] = 'Vous devez selectionner un album';
+$lang['You need to select a map'] = 'Vous devez selectionner une carte';
+$lang['You need to select a picture'] = 'Vous devez selectionner une photo';
+$lang['You need to select a pin'] = 'Vous devez selectionner un POI';
+$lang['You need to select a zone'] = 'Vous devez selectionner une zone';
+$lang['Zone'] = 'Zone';
+$lang['Zone mode'] = 'Gestion des zones';
+$lang['Zone Title'] = 'Titre de la zone';
+$lang['Zoom'] = 'Zoom';
+$lang['Zoom level 1'] = 'Zoom niveau 1';
+$lang['Zoom level 10'] = 'Zoom niveau 10';
+$lang['Zoom level 11'] = 'Zoom niveau 11';
+$lang['Zoom level 12'] = 'Zoom niveau 12';
+$lang['Zoom level 13'] = 'Zoom niveau 13';
+$lang['Zoom level 14'] = 'Zoom niveau 14';
+$lang['Zoom level 15'] = 'Zoom niveau 15';
+$lang['Zoom level 16'] = 'Zoom niveau 16';
+$lang['Zoom level 17'] = 'Zoom niveau 17';
+$lang['Zoom level 18'] = 'Zoom niveau 18';
+$lang['Zoom level 19'] = 'Zoom niveau 19';
+$lang['Zoom level 2'] = 'Zoom niveau 2';
+$lang['Zoom level 20'] = 'Zoom niveau 20';
+$lang['Zoom level 3'] = 'Zoom niveau 3';
+$lang['Zoom level 4'] = 'Zoom niveau 4';
+$lang['Zoom level 5'] = 'Zoom niveau 5';
+$lang['Zoom level 6'] = 'Zoom niveau 6';
+$lang['Zoom level 7'] = 'Zoom niveau 7';
+$lang['Zoom level 8'] = 'Zoom niveau 8';
+$lang['Zoom level 9'] = 'Zoom niveau 9';
+$lang['Zoom maximum'] = 'Zoom maximum';
 $lang['Zoom minimum'] = 'Zoom minimum';
+$lang['Zoom maximum'] = 'Zoom maximum';
+$lang['Annuler le mode creation'] = 'Annuler le mode creation';
+$lang['Set'] = 'Definir';
+$lang['Action'] = 'Action';
+$lang['Contenu'] = "Contenu de l'album";
+$lang['Zoom niveau 1'] = 'Zoom niveau 1';
+$lang['Zoom niveau 2'] = 'Zoom niveau 2';
+$lang['Zoom niveau 3'] = 'Zoom niveau 3';
+$lang['Zoom niveau 4'] = 'Zoom niveau 4';
+$lang['Zoom niveau 5'] = 'Zoom niveau 5';
+$lang['Zoom niveau 6'] = 'Zoom niveau 6';
+$lang['Zoom niveau 7'] = 'Zoom niveau 7';
+$lang['Zoom niveau 8'] = 'Zoom niveau 8';
+$lang['Zoom niveau 9'] = 'Zoom niveau 9';
+$lang['Zoom niveau 10'] = 'Zoom niveau 10';
+$lang['Zoom niveau 11'] = 'Zoom niveau 11';
+$lang['Zoom niveau 12'] = 'Zoom niveau 12';
+$lang['Zoom niveau 13'] = 'Zoom niveau 13';
+$lang['Zoom niveau 14'] = 'Zoom niveau 14';
+$lang['Zoom niveau 15'] = 'Zoom niveau 15';
+$lang['Zoom niveau 16'] = 'Zoom niveau 16';
+$lang['Zoom niveau 17'] = 'Zoom niveau 17';
+$lang['Zoom niveau 18'] = 'Zoom niveau 18';
+$lang['Zoom niveau 19'] = 'Zoom niveau 19';
+$lang['Zoom niveau 20'] = 'Zoom niveau 20';
+$lang['Supprimer la localisation'] = 'Supprimer la localisation';
+$lang['Etes-vous sur ?'] = 'Etes-vous sur ?';
+$lang['Valider'] = 'Valider';
+$lang['Configuration'] = 'Configuration';
+$lang['Bing Maps Key'] = 'Cle Bing Maps';
+$lang['Center Latittude'] = 'Latitude initiale';
+$lang['Center Longitude'] = 'Longitude initiale';
+$lang['Zoom'] = 'Zoom initial';
+$lang['Categorie'] = 'Categorie';
+$lang['Submit'] = 'Enregistrer';
+$lang['Cliquez pour zoomer sur'] = 'Cliquez pour zoomer sur ';
+$lang['Cliquez pour acceder aux photos'] = 'Cliquez pour acc&egrave;der aux photos ';
 ?>

extensions/Psli_BingMaps/language/it_IT/plugin.lang.php

-                      r14921
+                      r15432
 // +-----------------------------------------------------------------------+
 $lang['Action'] = 'Azione';
+$lang['Annuler le mode creation'] = 'Annulla modalità di perimetro';
+$lang['Action Album'] = 'Action Album';
+$lang['Action Picture'] = 'Action Picture';
+$lang['Action Zoom'] = 'Action Zoom';
+$lang['Added pictures'] = 'Added pictures';
+$lang['Associated map'] = 'Associated map';
+$lang['Batch association'] = 'Batch association';
 $lang['Bing Maps Key'] = 'Bing Maps Key';
+$lang['Categorie'] = 'Categoria';
+$lang['Category'] = 'Categoria';
+$lang['Category not selected'] = 'Category not selected';
 $lang['Center Latittude'] = 'A partire dalla Latitude';
 $lang['Center Longitude'] = 'A partire dalla longitudine';
+$lang['Cliquez pour acceder aux photos'] = 'Cliccare per visualizzare';
+$lang['Cliquez pour zoomer sur'] = 'Clicca per ingrandire per';
+$lang['Configuration'] = 'setup';
+$lang['Contenu'] = 'Mostrare l\'immagine della categoria';
+$lang['Creer une zone'] = 'creare perimetro';
+$lang['Enregistrer la zone'] = 'salvare perimetro';
+$lang['Etes-vous sur ?'] = 'Siete sicuri?';
+$lang['Change Zoom Level'] = 'Change Zoom Level';
+$lang['Click to show pictures of'] = 'Cliccare per visualizzare';
+$lang['Click to zoom on'] = 'Clicca per ingrandire per';
+$lang['Configuration'] = 'Setup';
+$lang['Configuration mode'] = 'Configuration mode';
+$lang['Create a map'] = 'Create a map';
+$lang['Create a pin'] = 'Create a pin';
+$lang['Create a zone'] = 'Creare perimetro';
+$lang['Delete all points'] = 'Rimuovere tutto';
+$lang['Delete last point'] = 'Cancellare ultimo punto';
+$lang['Delete this map'] = 'Delete this map';
+$lang['Delete this picture'] = 'Delete this picture';
+$lang['Delete this pin'] = 'Delete this pin';
+$lang['Delete this zone'] = 'Delete this zone';
+$lang['Entity field'] = 'Entity field';
+$lang['Exif import'] = 'Exif import';
+$lang['fifth step : check association with your maps'] = 'fifth step : check association with your maps';
+$lang['first step : create map'] = 'first step : create map';
+$lang['fourth step : make modification to pin associated to your pictures'] = 'fourth step : make modification to pin associated to your pictures';
+$lang['last step : Enjoy !'] = 'last step : Enjoy !';
 $lang['Latitude'] = 'Latitudine';
-$lang['Localisation - Plugin Psli-BingMaps'] = 'Localizazione - Plug-in Psli-BingMaps';
 $lang['Longitude'] = 'Longitudine';
+$lang['PointnClick Map'] = 'Mappa point and click';
+$lang['Map mode'] = 'Map mode';
+$lang['Map Title'] = 'Map Title';
+$lang['Modified pictures'] = 'Modified pictures';
+$lang['New Entity'] = 'New Entity';
+$lang['New Map'] = 'New Map';
+$lang['New Picture'] = 'New Picture';
+$lang['New Pin'] = 'New Pin';
+$lang['New Zone'] = 'New Zone';
+$lang['No exif in pictures for this category'] = 'No exif in pictures for this category';
+$lang['No selected entity'] = 'No selected entity';
+$lang['No selected map'] = 'No selected map';
+$lang['Not assign to a category'] = 'Not assign to a category';
+$lang['Open Category'] = 'Open Category';
+$lang['Open Picture'] = 'Open Picture';
+$lang['Open this category'] = 'Open this category';
+$lang['Open this map'] = 'Open this map';
+$lang['Open this picture'] = 'Open this picture';
+$lang['Open this pin'] = 'Open this pin';
+$lang['Open this zone'] = 'Open this zone';
+$lang['Picture'] = 'Picture';
+$lang['Picture mode'] = 'Picture mode';
+$lang['Picture Title'] = 'Picture Title';
+$lang['pictures'] = 'pictures';
+$lang['Pin'] = 'Pin';
+$lang['Pin mode'] = 'Pin mode';
+$lang['Pin Title'] = 'Pin Title';
+$lang['Reload saved zone'] = 'Reload saved zone';
+$lang['second step : import exif data from your pictures'] = 'second step : import exif data from your pictures';
+$lang['Select a Category'] = 'Select a Category';
+$lang['Select a Map'] = 'Select a Map';
+$lang['Select a picture'] = 'Select a picture';
+$lang['Select a pin'] = 'Select a pin';
+$lang['Select a zone'] = 'Select a zone';
 $lang['Set'] = 'Set';
+$lang['Setup Helper'] = 'Utilizza la mappa per impostare la posizione iniziale, centrale e livello di zoom della mappa.';
+$lang['Submit'] = 'Salvare';
+$lang['Supprimer la localisation'] = 'Eliminare tutti i dati';
+$lang['Supprimer le dernier point'] = 'Cancellare ultimo punto';
+$lang['Tout effacer'] = 'rimuovere tutto';
+$lang['Valider'] = 'commettere';
+$lang['Zoom maximum'] = 'zoom massimo';
+$lang['Zoom minimum'] = 'zoom minimo';
+$lang['Zoom niveau 10'] = 'Zoom al livello 10';
+$lang['Zoom niveau 11'] = 'Zoom al livello 11';
+$lang['Zoom niveau 12'] = 'Zoom al livello 12';
+$lang['Zoom niveau 13'] = 'Zoom al livello 13';
+$lang['Zoom niveau 14'] = 'Zoom al livello 14';
+$lang['Zoom niveau 15'] = 'Zoom al livello 15';
+$lang['Zoom niveau 16'] = 'Zoom al livello 16';
+$lang['Zoom niveau 17'] = 'Zoom al livello 17';
+$lang['Zoom niveau 18'] = 'Zoom al livello 18';
+$lang['Zoom niveau 19'] = 'Zoom al livello 19';
+$lang['Zoom niveau 1'] = 'Zoom al livello 1';
+$lang['Zoom niveau 20'] = 'Zoom al livello 20';
+$lang['Zoom niveau 2'] = 'Zoom al livello 2';
+$lang['Zoom niveau 3'] = 'Zoom al livello 3';
+$lang['Zoom niveau 4'] = 'Zoom al livello 4';
+$lang['Zoom niveau 5'] = 'Zoom al livello 5';
+$lang['Zoom niveau 6'] = 'Zoom al livello 6';
+$lang['Zoom niveau 7'] = 'Zoom al livello 7';
+$lang['Zoom niveau 8'] = 'Zoom al livello 8';
+$lang['Zoom niveau 9'] = 'Zoom al livello 9';
+$lang['Show guest view'] = 'Show guest view';
+$lang['Show map center'] = 'Show map center';
+$lang['third step : create new zone and new pin'] = 'third step : create new zone and new pin';
+$lang['User manual'] = 'User manual';
+$lang['You need to select a category'] = 'You need to select a category';
+$lang['You need to select a map'] = 'You need to select a map';
+$lang['You need to select a picture'] = 'You need to select a picture';
+$lang['You need to select a pin'] = 'You need to select a pin';
+$lang['You need to select a zone'] = 'You need to select a zone';
+$lang['Zone'] = 'Zone';
+$lang['Zone mode'] = 'Zone mode';
+$lang['Zone Title'] = 'Zone Title';
 $lang['Zoom'] = 'A partire dallo Zoom';
+$lang['Zoom level 1'] = 'Zoom al livello 1';
+$lang['Zoom level 10'] = 'Zoom al livello 10';
+$lang['Zoom level 11'] = 'Zoom al livello 11';
+$lang['Zoom level 12'] = 'Zoom al livello 12';
+$lang['Zoom level 13'] = 'Zoom al livello 13';
+$lang['Zoom level 14'] = 'Zoom al livello 14';
+$lang['Zoom level 15'] = 'Zoom al livello 15';
+$lang['Zoom level 16'] = 'Zoom al livello 16';
+$lang['Zoom level 17'] = 'Zoom al livello 17';
+$lang['Zoom level 18'] = 'Zoom al livello 18';
+$lang['Zoom level 19'] = 'Zoom al livello 19';
+$lang['Zoom level 2'] = 'Zoom al livello 2';
+$lang['Zoom level 20'] = 'Zoom al livello 20';
+$lang['Zoom level 3'] = 'Zoom al livello 3';
+$lang['Zoom level 4'] = 'Zoom al livello 4';
+$lang['Zoom level 5'] = 'Zoom al livello 5';
+$lang['Zoom level 6'] = 'Zoom al livello 6';
+$lang['Zoom level 7'] = 'Zoom al livello 7';
+$lang['Zoom level 8'] = 'Zoom al livello 8';
+$lang['Zoom level 9'] = 'Zoom al livello 9';
+$lang['Zoom maximum'] = 'Zoom massimo';
+$lang['Zoom minimum'] = 'Zoom minimo';
 ?>

extensions/Psli_BingMaps/language/pt_PT/plugin.lang.php

-                      r14908
+                      r15432
 // +-----------------------------------------------------------------------+
 $lang['Action'] = 'Acção';
+$lang['Annuler le mode creation'] = 'Cancelar o modo perimetro';
+$lang['Action Album'] = 'Action Album';
+$lang['Action Picture'] = 'Action Picture';
+$lang['Action Zoom'] = 'Action Zoom';
+$lang['Added pictures'] = 'Added pictures';
+$lang['Associated map'] = 'Associated map';
+$lang['Batch association'] = 'Batch association';
 $lang['Bing Maps Key'] = 'Chave dos mapas bing';
+$lang['Categorie'] = 'Categoria';
+$lang['Category'] = 'Categoria';
+$lang['Category not selected'] = 'Category not selected';
 $lang['Center Latittude'] = 'Iniciar Latitude';
 $lang['Center Longitude'] = 'Iniciar Longitude';
+$lang['Cliquez pour acceder aux photos'] = 'Clique para ver';
+$lang['Cliquez pour zoomer sur'] = 'Clique para zoom ';
+$lang['Change Zoom Level'] = 'Change Zoom Level';
+$lang['Click to show pictures of'] = 'Clique para ver';
+$lang['Click to zoom on'] = 'Clique para zoom ';
 $lang['Configuration'] = 'Instalar';
+$lang['Contenu'] = 'Mostrar a foto da categoria';
+$lang['Creer une zone'] = 'Criar perimetro';
+$lang['Enregistrer la zone'] = 'Salvar perimetro';
+$lang['Etes-vous sur ?'] = 'Tem a certeza?';
+$lang['Configuration mode'] = 'Configuration mode';
+$lang['Create a map'] = 'Create a map';
+$lang['Create a pin'] = 'Create a pin';
+$lang['Create a zone'] = 'Criar perimetro';
+$lang['Delete all points'] = 'Remover tudo';
+$lang['Delete last point'] = 'Apagar último ponto';
+$lang['Delete this map'] = 'Delete this map';
+$lang['Delete this picture'] = 'Delete this picture';
+$lang['Delete this pin'] = 'Delete this pin';
+$lang['Delete this zone'] = 'Delete this zone';
+$lang['Entity field'] = 'Entity field';
+$lang['Exif import'] = 'Exif import';
+$lang['fifth step : check association with your maps'] = 'fifth step : check association with your maps';
+$lang['first step : create map'] = 'first step : create map';
+$lang['fourth step : make modification to pin associated to your pictures'] = 'fourth step : make modification to pin associated to your pictures';
+$lang['last step : Enjoy !'] = 'last step : Enjoy !';
 $lang['Latitude'] = 'Latitude';
-$lang['Localisation - Plugin Psli-BingMaps'] = 'Localização - Extenção Psli-BingMaps';
 $lang['Longitude'] = 'Longitude';
+$lang['PointnClick Map'] = 'Aponte e clique no mapa';
+$lang['Set'] = 'Definir';
+$lang['Setup Helper'] = 'Use o mapa para definir a posição central inicial e nível de zoom do mapa';
+$lang['Submit'] = 'Salvar';
+$lang['Supprimer la localisation'] = 'Apagar todos os dados';
+$lang['Supprimer le dernier point'] = 'Apagar último ponto';
+$lang['Tout effacer'] = 'Remover tudo';
+$lang['Valider'] = 'Cometer';
+$lang['Map mode'] = 'Map mode';
+$lang['Map Title'] = 'Map Title';
+$lang['Modified pictures'] = 'Modified pictures';
+$lang['New Entity'] = 'New Entity';
+$lang['New Map'] = 'New Map';
+$lang['New Picture'] = 'New Picture';
+$lang['New Pin'] = 'New Pin';
+$lang['New Zone'] = 'New Zone';
+$lang['No exif in pictures for this category'] = 'No exif in pictures for this category';
+$lang['No selected entity'] = 'No selected entity';
+$lang['No selected map'] = 'No selected map';
+$lang['Not assign to a category'] = 'Not assign to a category';
+$lang['Open Category'] = 'Open Category';
+$lang['Open Picture'] = 'Open Picture';
+$lang['Open this category'] = 'Open this category';
+$lang['Open this map'] = 'Open this map';
+$lang['Open this picture'] = 'Open this picture';
+$lang['Open this pin'] = 'Open this pin';
+$lang['Open this zone'] = 'Open this zone';
+$lang['Picture'] = 'Picture';
+$lang['Picture mode'] = 'Picture mode';
+$lang['Picture Title'] = 'Picture Title';
+$lang['pictures'] = 'pictures';
+$lang['Pin'] = 'Pin';
+$lang['Pin mode'] = 'Pin mode';
+$lang['Pin Title'] = 'Pin Title';
+$lang['Reload saved zone'] = 'Reload saved zone';
+$lang['second step : import exif data from your pictures'] = 'second step : import exif data from your pictures';
+$lang['Select a Category'] = 'Select a Category';
+$lang['Select a Map'] = 'Select a Map';
+$lang['Select a picture'] = 'Select a picture';
+$lang['Select a pin'] = 'Select a pin';
+$lang['Select a zone'] = 'Select a zone';
+$lang['Set'] = 'Set';
+$lang['Show guest view'] = 'Show guest view';
+$lang['Show map center'] = 'Show map center';
+$lang['third step : create new zone and new pin'] = 'third step : create new zone and new pin';
+$lang['User manual'] = 'User manual';
+$lang['You need to select a category'] = 'You need to select a category';
+$lang['You need to select a map'] = 'You need to select a map';
+$lang['You need to select a picture'] = 'You need to select a picture';
+$lang['You need to select a pin'] = 'You need to select a pin';
+$lang['You need to select a zone'] = 'You need to select a zone';
+$lang['Zone'] = 'Zone';
+$lang['Zone mode'] = 'Zone mode';
+$lang['Zone Title'] = 'Zone Title';
+$lang['Zoom'] = 'Iniciar zoom';
+$lang['Zoom level 1'] = 'Zoom nível 1';
+$lang['Zoom level 10'] = 'Zoom nível 10';
+$lang['Zoom level 11'] = 'Zoom nível 11';
+$lang['Zoom level 12'] = 'Zoom nível 12';
+$lang['Zoom level 13'] = 'Zoom nível 13';
+$lang['Zoom level 14'] = 'Zoom nível 14';
+$lang['Zoom level 15'] = 'Zoom nível 15';
+$lang['Zoom level 16'] = 'Zoom nível 16';
+$lang['Zoom level 17'] = 'Zoom nível 17';
+$lang['Zoom level 18'] = 'Zoom nível 18';
+$lang['Zoom level 19'] = 'Zoom nível 19';
+$lang['Zoom level 2'] = 'Zoom nível 2';
+$lang['Zoom level 20'] = 'Zoom nível 20';
+$lang['Zoom level 3'] = 'Zoom nível 3';
+$lang['Zoom level 4'] = 'Zoom nível 4';
+$lang['Zoom level 5'] = 'Zoom nível 5';
+$lang['Zoom level 6'] = 'Zoom nível 6';
+$lang['Zoom level 7'] = 'Zoom nível 7';
+$lang['Zoom level 8'] = 'Zoom nível 8';
+$lang['Zoom level 9'] = 'Zoom nível 9';
 $lang['Zoom maximum'] = 'Zoom máximo';
 $lang['Zoom minimum'] = 'Zoom mínimo';
-$lang['Zoom niveau 10'] = 'Zoom nível 10';
-$lang['Zoom niveau 11'] = 'Zoom nível 11';
-$lang['Zoom niveau 12'] = 'Zoom nível 12';
-$lang['Zoom niveau 13'] = 'Zoom nível 13';
-$lang['Zoom niveau 14'] = 'Zoom nível 14';
-$lang['Zoom niveau 15'] = 'Zoom nível 15';
-$lang['Zoom niveau 16'] = 'Zoom nível 16';
-$lang['Zoom niveau 17'] = 'Zoom nível 17';
-$lang['Zoom niveau 18'] = 'Zoom nível 18';
-$lang['Zoom niveau 19'] = 'Zoom nível 19';
-$lang['Zoom niveau 1'] = 'Zoom nível 1';
-$lang['Zoom niveau 20'] = 'Zoom nível 20';
-$lang['Zoom niveau 2'] = 'Zoom nível 2';
-$lang['Zoom niveau 3'] = 'Zoom nível 3';
-$lang['Zoom niveau 4'] = 'Zoom nível 4';
-$lang['Zoom niveau 5'] = 'Zoom nível 5';
-$lang['Zoom niveau 6'] = 'Zoom nível 6';
-$lang['Zoom niveau 7'] = 'Zoom nível 7';
-$lang['Zoom niveau 8'] = 'Zoom nível 8';
-$lang['Zoom niveau 9'] = 'Zoom nível 9';
-$lang['Zoom'] = 'Iniciar zoom';
 ?>

extensions/Psli_BingMaps/language/ru_RU/plugin.lang.php

-                      r15181
+                      r15432
 // +-----------------------------------------------------------------------+
 $lang['Action'] = 'Действие';
+$lang['Annuler le mode creation'] = 'Отмена режима периметра';
+$lang['Action Album'] = 'Action Album';
+$lang['Action Picture'] = 'Action Picture';
+$lang['Action Zoom'] = 'Action Zoom';
+$lang['Added pictures'] = 'Added pictures';
+$lang['Associated map'] = 'Associated map';
+$lang['Batch association'] = 'Batch association';
 $lang['Bing Maps Key'] = 'Ключ Bing Maps';
+$lang['Categorie'] = 'Категория';
+$lang['Category'] = 'Категория';
+$lang['Category not selected'] = 'Category not selected';
 $lang['Center Latittude'] = 'Начальная широта';
 $lang['Center Longitude'] = 'Начальная долгота';
+$lang['Cliquez pour acceder aux photos'] = 'Нажать для просмотра';
+$lang['Cliquez pour zoomer sur'] = 'Нажать для изменения масштаба до ';
+$lang['Change Zoom Level'] = 'Change Zoom Level';
+$lang['Click to show pictures of'] = 'Нажать для просмотра';
+$lang['Click to zoom on'] = 'Нажать для изменения масштаба до';
 $lang['Configuration'] = 'Установка';
+$lang['Contenu'] = 'Показать картинку категории';
+$lang['Creer une zone'] = 'Создание периметра';
+$lang['Enregistrer la zone'] = 'Сохранить периметр';
+$lang['Etes-vous sur ?'] = 'Уверены?';
+$lang['Configuration mode'] = 'Configuration mode';
+$lang['Create a map'] = 'Create a map';
+$lang['Create a pin'] = 'Create a pin';
+$lang['Create a zone'] = 'Создание периметра';
+$lang['Delete all points'] = 'Удалить все';
+$lang['Delete last point'] = 'Удалить последнюю точку';
+$lang['Delete this map'] = 'Delete this map';
+$lang['Delete this picture'] = 'Delete this picture';
+$lang['Delete this pin'] = 'Delete this pin';
+$lang['Delete this zone'] = 'Delete this zone';
+$lang['Entity field'] = 'Entity field';
+$lang['Exif import'] = 'Exif import';
+$lang['fifth step : check association with your maps'] = 'fifth step : check association with your maps';
+$lang['first step : create map'] = 'first step : create map';
+$lang['fourth step : make modification to pin associated to your pictures'] = 'fourth step : make modification to pin associated to your pictures';
+$lang['last step : Enjoy !'] = 'last step : Enjoy !';
 $lang['Latitude'] = 'Широта';
-$lang['Localisation - Plugin Psli-BingMaps'] = 'Локализация - Плагин Psli-BingMaps';
 $lang['Longitude'] = 'Долгота';
+$lang['PointnClick Map'] = 'Укажите точку на карте';
+$lang['Set'] = 'Набор';
+$lang['Setup Helper'] = 'Используйте карту, чтобы установить начальную позицию центра и уровень масштабирования карты.';
+$lang['Submit'] = 'Сохранить';
+$lang['Supprimer la localisation'] = 'Удалить все данные';
+$lang['Supprimer le dernier point'] = 'Удалить последнюю точку';
+$lang['Tout effacer'] = 'Удалить все';
+$lang['Valider'] = 'Передать';
+$lang['Map mode'] = 'Map mode';
+$lang['Map Title'] = 'Map Title';
+$lang['Modified pictures'] = 'Modified pictures';
+$lang['New Entity'] = 'New Entity';
+$lang['New Map'] = 'New Map';
+$lang['New Picture'] = 'New Picture';
+$lang['New Pin'] = 'New Pin';
+$lang['New Zone'] = 'New Zone';
+$lang['No exif in pictures for this category'] = 'No exif in pictures for this category';
+$lang['No selected entity'] = 'No selected entity';
+$lang['No selected map'] = 'No selected map';
+$lang['Not assign to a category'] = 'Not assign to a category';
+$lang['Open Category'] = 'Open Category';
+$lang['Open Picture'] = 'Open Picture';
+$lang['Open this category'] = 'Open this category';
+$lang['Open this map'] = 'Open this map';
+$lang['Open this picture'] = 'Open this picture';
+$lang['Open this pin'] = 'Open this pin';
+$lang['Open this zone'] = 'Open this zone';
+$lang['Picture'] = 'Picture';
+$lang['Picture mode'] = 'Picture mode';
+$lang['Picture Title'] = 'Picture Title';
+$lang['pictures'] = 'pictures';
+$lang['Pin'] = 'Pin';
+$lang['Pin mode'] = 'Pin mode';
+$lang['Pin Title'] = 'Pin Title';
+$lang['Reload saved zone'] = 'Reload saved zone';
+$lang['second step : import exif data from your pictures'] = 'second step : import exif data from your pictures';
+$lang['Select a Category'] = 'Select a Category';
+$lang['Select a Map'] = 'Select a Map';
+$lang['Select a picture'] = 'Select a picture';
+$lang['Select a pin'] = 'Select a pin';
+$lang['Select a zone'] = 'Select a zone';
+$lang['Set'] = 'Set';
+$lang['Show guest view'] = 'Show guest view';
+$lang['Show map center'] = 'Show map center';
+$lang['third step : create new zone and new pin'] = 'third step : create new zone and new pin';
+$lang['User manual'] = 'User manual';
+$lang['You need to select a category'] = 'You need to select a category';
+$lang['You need to select a map'] = 'You need to select a map';
+$lang['You need to select a picture'] = 'You need to select a picture';
+$lang['You need to select a pin'] = 'You need to select a pin';
+$lang['You need to select a zone'] = 'You need to select a zone';
+$lang['Zone'] = 'Zone';
+$lang['Zone mode'] = 'Zone mode';
+$lang['Zone Title'] = 'Zone Title';
+$lang['Zoom'] = 'Начальный зум';
+$lang['Zoom level 1'] = 'Зум уровень 1';
+$lang['Zoom level 10'] = 'Зум уровень 10';
+$lang['Zoom level 11'] = 'Зум уровень 11';
+$lang['Zoom level 12'] = 'Зум уровень 12';
+$lang['Zoom level 13'] = 'Зум уровень 13';
+$lang['Zoom level 14'] = 'Зум уровень 14';
+$lang['Zoom level 15'] = 'Зум уровень 15';
+$lang['Zoom level 16'] = 'Зум уровень 16';
+$lang['Zoom level 17'] = 'Зум уровень 17';
+$lang['Zoom level 18'] = 'Зум уровень 18';
+$lang['Zoom level 19'] = 'Зум уровень 19';
+$lang['Zoom level 2'] = 'Зум уровень 2';
+$lang['Zoom level 20'] = 'Зум уровень 20';
+$lang['Zoom level 3'] = 'Зум уровень 3';
+$lang['Zoom level 4'] = 'Зум уровень 4';
+$lang['Zoom level 5'] = 'Зум уровень 5';
+$lang['Zoom level 6'] = 'Зум уровень 6';
+$lang['Zoom level 7'] = 'Зум уровень 7';
+$lang['Zoom level 8'] = 'Зум уровень 8';
+$lang['Zoom level 9'] = 'Зум уровень 9';
 $lang['Zoom maximum'] = 'Максимальный зум';
 $lang['Zoom minimum'] = 'Минимальный зум';
-$lang['Zoom niveau 10'] = 'Зум уровень 10';
-$lang['Zoom niveau 11'] = 'Зум уровень 11';
-$lang['Zoom niveau 12'] = 'Зум уровень 12';
-$lang['Zoom niveau 13'] = 'Зум уровень 13';
-$lang['Zoom niveau 14'] = 'Зум уровень 14';
-$lang['Zoom niveau 15'] = 'Зум уровень 15';
-$lang['Zoom niveau 16'] = 'Зум уровень 16';
-$lang['Zoom niveau 17'] = 'Зум уровень 17';
-$lang['Zoom niveau 18'] = 'Зум уровень 18';
-$lang['Zoom niveau 19'] = 'Зум уровень 19';
-$lang['Zoom niveau 1'] = 'Зум уровень 1';
-$lang['Zoom niveau 20'] = 'Зум уровень 20';
-$lang['Zoom niveau 2'] = 'Зум уровень 2';
-$lang['Zoom niveau 3'] = 'Зум уровень 3';
-$lang['Zoom niveau 4'] = 'Зум уровень 4';
-$lang['Zoom niveau 5'] = 'Зум уровень 5';
-$lang['Zoom niveau 6'] = 'Зум уровень 6';
-$lang['Zoom niveau 7'] = 'Зум уровень 7';
-$lang['Zoom niveau 8'] = 'Зум уровень 8';
-$lang['Zoom niveau 9'] = 'Зум уровень 9';
-$lang['Zoom'] = 'Начальный зум';
 ?>

extensions/Psli_BingMaps/main.inc.php

-                      r14913
+                      r15432
 Author: psli
 Description: Extension to piwigo for use of bing maps to navigate in geolocalized album
------------------------------------------------------------------------------------------
-.1             2012-05-08      Ajout de l'internationalisation et de l'anglais
------------------------------------------------------------------------------------------
-.0             2012-05-07      Verison initiale
------------------------------------------------------------------------------------------
 */
 // Chech whether we are indeed included by Piwigo.
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 // define Path for PHP and JS file
+// define generic Path
 define ('PSLI_BINGMAPS_PATH', PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
 //define ('PSLI_BINGMAPS_JS', PSLI_BINGMAPS_PATH.'JS/Psli-BingMaps.js');
+define('PSLI_BINGMAPS_TEMPLATE_PATH', dirname(__FILE__).'/');
 define ('PSLI_BINGMAPS_VERSION_INC_PHP', PSLI_BINGMAPS_PATH.'include/version.inc.php');
-define ('PSLI_BINGMAPS_ADMIN_INC_PHP', PSLI_BINGMAPS_PATH.'include/admin.inc.php');
-define ('PSLI_BINGMAPS_GUEST_INC_PHP', PSLI_BINGMAPS_PATH.'include/guest.inc.php');
-define ('PSLI_BINGMAPS_ADMIN_PHP', PSLI_BINGMAPS_PATH.'include/admin.php');
+// define Path for template file
+define('PSLI_BINGMAPS_TEMPLATE_PATH', dirname(__FILE__).'/');
+define ('PSLI_BINGMAPS_ADMIN_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'template/admin.tpl');
+// Include define data
+// Include define data and global function
 include_once(dirname(__FILE__).'/include/const.inc.php');
+include_once(dirname(__FILE__).'/include/function.inc.php');
 // Check plugin update
 include_once(PSLI_BINGMAPS_VERSION_INC_PHP);
+//******* Language data *******
+load_language('plugin.lang', PSLI_BINGMAPS_TEMPLATE_PATH);
 // Plugin for admin
 …
                 $root = $row['value'];
+        }
+        define ('PSLI_BINGMAPS_JS', $root.'plugins/Psli-BingMaps/JS/Psli-BingMaps.js');
+        include_once(PSLI_BINGMAPS_ADMIN_INC_PHP);
+        // define Path for admin file
+        define ('PSLI_BINGMAPS_ADMIN_PHP', PSLI_BINGMAPS_PATH.'admin/admin.php');
+        define ('PSLI_BINGMAPS_CLASS_ENTITY_PHP', PSLI_BINGMAPS_PATH.'admin/class/psli_entity.class.php');
+        // Define path for configuration tab
+        define ('PSLI_BINGMAPS_ADMIN_CONF_PHP', PSLI_BINGMAPS_PATH.'admin/include/admin_conf.inc.php');
+        define ('PSLI_BINGMAPS_ADMIN_CONF_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'admin/template/admin_conf.tpl');
+        // Define path for map tab
+        define ('PSLI_BINGMAPS_ADMIN_MAP_PHP', PSLI_BINGMAPS_PATH.'admin/include/admin_map.inc.php');
+        define ('PSLI_BINGMAPS_CLASS_MAP_PHP', PSLI_BINGMAPS_PATH.'admin/class/psli_map.class.php');
+        define ('PSLI_BINGMAPS_ADMIN_MAP_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'admin/template/admin_map.tpl');
+        define ('PSLI_BINGMAPS_JS_MAP', $root.'plugins/Psli-BingMaps/admin/JS/Psli-BingMaps-Map.js');
+        // Define path for pin tab
+        define ('PSLI_BINGMAPS_ADMIN_PIN_PHP', PSLI_BINGMAPS_PATH.'admin/include/admin_pin.inc.php');
+        define ('PSLI_BINGMAPS_CLASS_PIN_PHP', PSLI_BINGMAPS_PATH.'admin/class/psli_pin.class.php');
+        define ('PSLI_BINGMAPS_ADMIN_PIN_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'admin/template/admin_pin.tpl');
+        define ('PSLI_BINGMAPS_JS_PIN', $root.'plugins/Psli-BingMaps/admin/JS/Psli-BingMaps-Pin.js');
+        // Define path for zone tab
+        define ('PSLI_BINGMAPS_ADMIN_ZONE_PHP', PSLI_BINGMAPS_PATH.'admin/include/admin_zone.inc.php');
+        define ('PSLI_BINGMAPS_CLASS_ZONE_PHP', PSLI_BINGMAPS_PATH.'admin/class/psli_zone.class.php');
+        define ('PSLI_BINGMAPS_ADMIN_ZONE_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'admin/template/admin_zone.tpl');
+        define ('PSLI_BINGMAPS_JS_ZONE', $root.'plugins/Psli-BingMaps/admin/JS/Psli-BingMaps-Zone.js');
+        // Define path for picture tab
+        define ('PSLI_BINGMAPS_ADMIN_PICTURE_PHP', PSLI_BINGMAPS_PATH.'admin/include/admin_picture.inc.php');
+        define ('PSLI_BINGMAPS_CLASS_PICTURE_PHP', PSLI_BINGMAPS_PATH.'admin/class/psli_picture.class.php');
+        define ('PSLI_BINGMAPS_ADMIN_PICTURE_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'admin/template/admin_picture.tpl');
+        // Define path for exif tab
+        define ('PSLI_BINGMAPS_ADMIN_EXIF_PHP', PSLI_BINGMAPS_PATH.'admin/include/admin_exif.inc.php');
+        define ('PSLI_BINGMAPS_ADMIN_EXIF_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'admin/template/admin_exif.tpl');
+        // Define path for batch tab
+        define ('PSLI_BINGMAPS_ADMIN_BATCH_PHP', PSLI_BINGMAPS_PATH.'admin/include/admin_batch.inc.php');
+        define ('PSLI_BINGMAPS_ADMIN_BATCH_TPL', PSLI_BINGMAPS_TEMPLATE_PATH.'admin/template/admin_batch.tpl');
+        define ('PSLI_BINGMAPS_ADMIN_BATCH_CSS', PSLI_BINGMAPS_PATH.'admin/css/admin_batch.css');
+        // Hook on to event on administration page.
+        add_event_handler('get_admin_plugin_menu_links', 'PSLIBINGMAPS_admin_menu');
+}
 else
 …
         $result = pwg_query($query);
         $row = pwg_db_fetch_assoc($result);
+        define ('PSLI_BINGMAPS_GUEST_INC_PHP', PSLI_BINGMAPS_PATH.'include/guest.inc.php');
         define ('PSLI_BINGMAPS_JS', $row['value'].'plugins/Psli-BingMaps/JS/Psli-BingMaps.js');
 …
+}
+/********************************************************************************************/
+// Add an entry to the 'Plugins' menu.
+/********************************************************************************************/
+function PSLIBINGMAPS_admin_menu($menu) {
+ array_push(
+   $menu,
+   array(
+     'NAME'  => 'PSLI-BingMaps',
+     'URL'   => get_admin_plugin_menu_link(PSLI_BINGMAPS_ADMIN_PHP)
+   )
+ );
+ return $menu;
+}
 ?>

extensions/Psli_BingMaps/maintain.inc.php

-                      r14913
+                      r15432
 <?php
 /*
-Version: 1.1
 Plugin Name: Psli-BingMaps
 Author: psli
-Description: Maintenance function for plugin "Psli-BingMaps"
 */
 …
 /********************************************************************************************/
 //               Plugin activation
+//               Plugin installation
 // Create all needed tables and parameters ( with value by default) in CONFIG_TABLE
 /********************************************************************************************/
 …
         $sql = '
+                CREATE TABLE IF NOT EXISTS `'.PSLI_MAPS_TABLE."` (
+                        `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+                        `id_category` smallint(5) unsigned DEFAULT NULL,
+                        `title` text,
+                        `lat` decimal(15,12) DEFAULT '0.000000000000',
+                        `lon` decimal(15,12) DEFAULT '0.000000000000',
+                        `zoom` smallint(6) DEFAULT NULL,
+                        PRIMARY KEY (`id`)
+                ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
+        pwg_query($sql);
+        $sql = '
                 CREATE TABLE IF NOT EXISTS `'.PSLI_ENTITIES_TABLE."` (
                         `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 …
                         `lon` decimal(15,12) DEFAULT '0.000000000000',
                         `title` text,
-                        `id_category` smallint(5) unsigned DEFAULT NULL,
                         `zoomMin` smallint(6) DEFAULT NULL,
                         `zoomMax` smallint(6) DEFAULT NULL,
                         `action` smallint(6) DEFAULT NULL,
+                        PRIMARY KEY (`id`),
+                        UNIQUE KEY `psli_i10` (`id_category`)
+                        `id_action` smallint(5) unsigned DEFAULT NULL,
+                        `type` smallint(1) default 1,
+                        PRIMARY KEY (`id`)
                 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
         pwg_query($sql);
+        $sql = '
+                CREATE TABLE IF NOT EXISTS `'.PSLI_ENTITIES_MAPS_TABLE."` (
+                        `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+                        `id_entity` smallint(5) unsigned DEFAULT NULL,
+                        `id_map` smallint(5) unsigned DEFAULT NULL,
+                        PRIMARY KEY (`id`),
+                        UNIQUE `psli_entity_map_1` (`id_entity`, `id_map`),
+                        INDEX `psli_entity_map_2` (`id_entity`),
+                        INDEX `psli_entity_map_3` (`id_map`)
+                ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
+        pwg_query($sql);
         $sql = '
 …
                 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;';
         pwg_query($sql);
+        $sql = 'INSERT INTO '.CONFIG_TABLE." (param, value) VALUES ('".PSLI_CONF_LON."', '0');";
+        pwg_query($sql);
+        $sql = 'INSERT INTO '.CONFIG_TABLE." (param, value) VALUES ('".PSLI_CONF_LAT."', '0');";
+        pwg_query($sql);
+        $sql = 'INSERT INTO '.CONFIG_TABLE." (param, value) VALUES ('".PSLI_CONF_ZOOM."', '2');";
+        pwg_query($sql);
         $sql = 'INSERT INTO '.CONFIG_TABLE." (param, value) VALUES ('".PSLI_CONF_KEY."', 'to define');";
         pwg_query($sql);
-        $sql = 'INSERT INTO '.CONFIG_TABLE." (param, value) VALUES ('".PSLI_CONF_CATEGORY."', 'to define');";
-        pwg_query($sql);
         $sql = 'INSERT INTO '.CONFIG_TABLE." (param, value) VALUES ('".PSLI_CONF_VERSION_MAJ."', '".PSLI_VERSION_MAJ."');";
         pwg_query($sql);
 …
         pwg_query($sql);
+        array_push($page['infos'], l10n('Information data registered in database'));
+}
 …
+{
         global $prefixeTable;
+        $sql = 'DROP TABLE `'.PSLI_MAPS_TABLE.'`;';
+        pwg_query($sql);
         $sql = 'DROP TABLE `'.PSLI_ENTITIES_TABLE.'`;';
+        pwg_query($sql);
+        $sql = 'DROP TABLE `'.PSLI_ENTITIES_MAPS_TABLE.'`;';
         pwg_query($sql);
         $sql = 'DROP TABLE `'.PSLI_DATAPOINT_TABLE.'`;';
         pwg_query($sql);
-        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_LAT."';";
-        pwg_query($sql);
-        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_LON."';";
-        pwg_query($sql);
-        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_ZOOM."';";
-        pwg_query($sql);
         $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_KEY."';";
-        pwg_query($sql);
-        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_CATEGORY."';";
         pwg_query($sql);
         $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_VERSION_MAJ."';";
 …
         $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_VERSION_MIN."';";
         pwg_query($sql);
+        $sql = 'DELETE FROM `'.CONFIG_TABLE."` WHERE param = '".PSLI_CONF_PATH."';";
+        pwg_query($sql);
+        array_push($page['infos'], l10n('Information data registered in database'));
+}

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: