Changeset 3235714

Timestamp:

02/05/2025 10:26:11 PM (14 months ago)

Author:

yhunter

Message:

plugin update

Location:

yamaps

Files:

• tags/0.6.28 (copied) (copied from yamaps/trunk)
• tags/0.6.28/js/btn.js (copied) (copied from yamaps/trunk/js/btn.js)
• tags/0.6.28/js/shortcode_parser.js (copied) (copied from yamaps/trunk/js/shortcode_parser.js)
• tags/0.6.28/languages/yamaps-ru_RU.mo (copied) (copied from yamaps/trunk/languages/yamaps-ru_RU.mo)
• tags/0.6.28/languages/yamaps-ru_RU.po (copied) (copied from yamaps/trunk/languages/yamaps-ru_RU.po)
• tags/0.6.28/languages/yamaps.pot (copied) (copied from yamaps/trunk/languages/yamaps.pot)
• tags/0.6.28/options.php (copied) (copied from yamaps/trunk/options.php)
• tags/0.6.28/readme.txt (copied) (copied from yamaps/trunk/readme.txt)
• tags/0.6.28/yamap.php (copied) (copied from yamaps/trunk/yamap.php)
• trunk/js/btn.js (modified) (47 diffs)
• trunk/js/shortcode_parser.js (modified) (1 diff)
• trunk/languages/yamaps.pot (modified) (9 diffs)
• trunk/options.php (modified) (27 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/style.content.css (modified) (1 diff)
• trunk/templates/tmpl-editor-yamap.html (modified) (1 diff)
• trunk/yamap.php (modified) (2 diffs)

yamaps/trunk/js/btn.js

@@ -2 +2 @@
 var apikey = '', apikeyexist = false, wp_locale=tinymce.util.I18n.getCode();
 if (yamap_defaults['apikey_map_option']!='') {
-    apikey="&apikey="+yamap_defaults['apikey_map_option'];
+    apikey="&apikey="+encodeURIComponent(yamap_defaults['apikey_map_option']);
     apikeyexist = true;
 }
-if (typeof wp_locale !== 'undefined') { //Защита от пустой локали. У кого-то была такая проблема
+if (typeof wp_locale !== 'undefined') { // Protection against empty locale. Some users had this problem
     if (wp_locale.length<1) {wp_locale="en_US";} 
 }
@@ -11 +11 @@
     wp_locale="en_US";
 }
-script.src = "https://api-maps.yandex.ru/2.1/?lang="+wp_locale+apikey;    
+script.src = "https://api-maps.yandex.ru/2.1/?lang="+encodeURIComponent(wp_locale)+apikey;    
 script.setAttribute('type', 'text/javascript');
 document.getElementsByTagName('head')[0].appendChild(script);
@@ -18 +18 @@
 var placemark = [];
 
-if (!editMapAction) {//Перенесено для корректной работы в WP 5.6
+if (!editMapAction) { // Moved for correct operation in WP 5.6
                             
     ym={map0: {center: coordaprox(yamap_defaults['center_map_option']), controls: yamap_defaults['controls_map_option'], height: yamap_defaults['height_map_option'], zoom: yamap_defaults['zoom_map_option'], maptype: yamap_defaults['type_map_option'], scrollzoom: optionCheck('wheelzoom_map_option'), mobiledrag: optionCheck('mobiledrag_map_option'), container: '', places: {}}};
@@ -24 +24 @@
 }  
 
-//Определяем отключен ли скролл колесом на редактируемой карте
+// Determine if scroll zoom is disabled on the edited map
 function checkParam(param) {
     var checker=true;
@@ -33 +33 @@
 }
 
-//Задаем дефолтные параметры из настроек
+// Set default parameters from settings
 function optionCheck(param) {
     var checker="0";
@@ -42 +42 @@
 }
 
-//Определяем заголовок окна для создания или редактирования
+// Determine the window title for creating or editing
 function checkTitle() {
     if (editMapAction) {
@@ -52 +52 @@
 }
 
-//Дефолтные данные
+// Default data
 var coords=[], mapcenter=yamap_defaults['center_map_option'], mapzoom=yamap_defaults['zoom_map_option'], maptype=yamap_defaults['type_map_option'], markicon, markcount=0, mapcount=1;
 
@@ -60 +60 @@
 
 
-//Изменение поля типа иконки    
+// Change the icon type field    
 function iconselectchange() {      // change icon type    
         if (activeplace!=='') {
@@ -69 +69 @@
 }
 
-
-
-//Округляем координаты до 4 знаков после запятой
+// Round coordinates to 4 decimal places
 function coordaprox(fullcoord) {
-        //надо сделать проверку на корректный ввод координат
+        // Need to check for valid coordinate input
         if (fullcoord.length!==2) {
             fullcoord=fullcoord.split(',');
@@ -83 +81 @@
 }
 
-//Изменяем поле с координатами метки
+// Change the coordinates field of the marker
 function markcoordchange() {
         jQuery("#markercoord").val(coordaprox(ym[mapselector].places[activeplace].coord));
 }
 
-//Активируем выключенное поле
+// Activate the disabled field
 function enablesinglefield(field) {
         jQuery(field).attr('disabled',false);
@@ -95 +93 @@
 }
 
-//Деактивируем поле
+// Deactivate the field
 function disablesinglefield(field) {
         jQuery(field).attr('disabled',true);
@@ -102 +100 @@
 }
 
-//Активируем выключенные поля после создания метки
+// Activate disabled fields after creating a marker
 function enablefields(fieldact=true) {
         if (fieldact) {
@@ -113 +111 @@
 } 
 
-//Проверяем значение чекбокса
+// Check the value of the checkbox
 function checkcheckbox(param) {
     if (jQuery("#"+param).attr('aria-checked')!="undefined") {
@@ -124 +122 @@
 }
 
-//Изменяем данные карты в массиве после изменения полей
+// Change the map data in the array after changing fields
 function mapdatechange() {
         
@@ -149 +147 @@
 }
 
-//Изменяем данные карты в массиве после изменения карты в редакторе
+// Change the map data in the array after changing the map in the editor
 function mapSave() {
         ym[mapselector].zoom=mapzoom;
@@ -156 +154 @@
 }
 
-//Изменаем данные активной метки в массиве по данным полей ввода
+// Change the active marker data in the array based on input field data
 function markchange() {
-
         if (activeplace!=='') {
-        
-            ym[mapselector].places[activeplace].name=jQuery("#markername").val().replace(/["]/g, '&quot;');
-            ym[mapselector].places[activeplace].coord=jQuery("#markercoord").val();
-            ym[mapselector].places[activeplace].color=jQuery("#colorbox #colorbox-inp").val();
-            ym[mapselector].places[activeplace].icon=jQuery("#markericon #markericon-inp").val();
+            // Escape special characters in the marker name
+            var markerName = jQuery("#markername").val().replace(/[&<>"']/g, function(m) {
+                return {
+                    '&': '&amp;',
+                    '<': '&lt;',
+                    '>': '&gt;',
+                    '"': '&quot;',
+                    "'": '&#039;'
+                }[m];
+            });
             
-            ym[mapselector].places[activeplace].url=jQuery("#markerurl").val();
-
-        }
-}
-
-//Изменяем данные полей ввода по данным массива    
+            ym[mapselector].places[activeplace].name = markerName;
+            ym[mapselector].places[activeplace].coord = jQuery("#markercoord").val();
+            ym[mapselector].places[activeplace].color = jQuery("#colorbox #colorbox-inp").val();
+            ym[mapselector].places[activeplace].icon = jQuery("#markericon #markericon-inp").val();
+            
+            // Escape URL
+            var markerUrl = jQuery("#markerurl").val();
+            if(markerUrl) {
+                try {
+                    markerUrl = encodeURI(markerUrl);
+                } catch(e) {
+                    markerUrl = '';
+                }
+            }
+            ym[mapselector].places[activeplace].url = markerUrl;
+        }
+}
+
+// Change the input field data based on the array data    
 function markerfields() {
         if (typeof ym[mapselector].places[activeplace].name !== 'undefined') {
@@ -184 +199 @@
 }
 
-//Выключаем поле координат, когда не выбрана метка
+// Disable the coordinates field when no marker is selected
 function inactive() {
             jQuery("#markercoord").val(yamap_object.NoCoord);
@@ -190 +205 @@
 }
 
-
-//Изменяем имя или хинт иконки в зависимости от ее типа
-function iconname(place) {       //change icon name
+// Change the name or hint of the icon depending on its type
+function iconname(place) {       // change icon name
         yacontent="";
         if (activeplace!=='') { 
@@ -201 +215 @@
         var yahint = "";
 
-        //Если иконка тянется, выводим название в iconContent
+        // Escape the marker name for safe display
+        markername = markername ? markername.replace(/[&<>"']/g, function(m) {
+            return {
+                '&': '&amp;',
+                '<': '&lt;',
+                '>': '&gt;',
+                '"': '&quot;',
+                "'": '&#039;'
+            }[m];
+        }) : '';
+
+        // If the icon is stretchy, display the name in iconContent
         if (markicon.indexOf("Stretchy")!==-1) { 
             yahint="";
             yacontent=markername;
         }
-
-        //Если круглая пустая иконка, то выводим в iconContent первый символ и название в hintContent
         else {
             if ((markicon==="islands#blueIcon")||(markicon==="islands#blueCircleIcon")) {
                 yahint=markername;
-
                 if ((yahint!="")&&(yahint!=undefined)) {
                     yacontent=yahint[0];
                 }
-                
             }
-            //Если иконка с точкой, то выводим название в hintContent
             else {
                 yahint=markername;
@@ -227 +247 @@
             placemark[place.replace('placemark', '')].properties.set('hintContent', yahint);
             placemark[place.replace('placemark', '')].properties.set('iconContent', yacontent);
-            //Проверяем, является ли поле иконки url-адресом. Если да, то ставим в качестве иконки кастомное изображение.
+            // Check if the icon field is a URL. If yes, set a custom image as the icon.
             if (markicon.indexOf("http")===-1) {
                 placemark[place.replace('placemark', '')].options.unset('iconLayout', 'default#image');
@@ -236 +256 @@
                 placemark[place.replace('placemark', '')].options.unset('preset', markicon);
                 placemark[place.replace('placemark', '')].options.set('iconLayout', 'default#image');
+                // Escape the icon URL
+                markicon = encodeURI(markicon);
                 placemark[place.replace('placemark', '')].options.set('iconImageHref', markicon);
             }
@@ -241 +263 @@
 }
 
-
-//Работаем с редактором tinyMCE в модальном окне
+// Work with the tinyMCE editor in the modal window
 (function() { 
     var editor = tinymce.activeEditor;
 
-    //Изменяем цвет иконки на карте, записываем в массив  
+    // Change the icon color on the map, write to the array  
     function markercolor (pcolor) {
-        //Если метки нет, цвета не прописываем
+        // If there is no marker, do not set the color
         if (activeplace!=='') {
             placemark[activeplace.replace('placemark', '')].options.set('iconColor', pcolor);
@@ -255 +276 @@
     }
 
-    //Плагин colorPicker для tinyMCE
+    // ColorPicker plugin for tinyMCE
     function createColorPickAction() {
 
@@ -277 +298 @@
     }
 
-
-    //Добавляем кнопку и меню плагина в редактор
+    // Add button and plugin menu to the editor
     tinymce.create("tinymce.plugins.yamap_plugin", {
 
-        //url argument holds the absolute url of our plugin directory
+        // url argument holds the absolute url of our plugin directory
         init : function(ed, url) {
 
-
-
-            //add new button    
+            // Add new button    
             ed.addButton("yamap", {
                 title : yamap_object.AddMap,
@@ -297 +315 @@
                         ed.execCommand("yamap_command");
                 }
-
-
             });
 
-
-
-
-
-            //Функционал кнопки в редакторе
+            // Functionality of the button in the editor
             ed.addCommand("yamap_command", function() {
             activeplace="";   
             markcount=0;         
                     
-                    
-                    //Инициализируем карту
+                    // Initialize the map
                     jQuery(document).ready(function() {                       
                         
 
-                        if (!editMapAction) { //Перенесено в начало кода из-за проблем в WP 5.6
+                        if (!editMapAction) { // Moved to the beginning of the code due to issues in WP 5.6
                             delete  ym.map0.places;
                             ym.map0.places = {};
 
-                        //    ym={map0: {center: coordaprox(yamap_defaults['center_map_option']), controls: yamap_defaults['controls_map_option'], height: yamap_defaults['height_map_option'], zoom: yamap_defaults['zoom_map_option'], maptype: yamap_defaults['type_map_option'], scrollzoom: optionCheck('wheelzoom_map_option'), mobiledrag: optionCheck('mobiledrag_map_option'), container: '', places: {}}};
-
                         }  
                         ymaps.ready(init);                      
@@ -326 +335 @@
                     });
                     
-                    //Удаляем метку с карты
+                    // Remove the marker from the map
                     function removeplacemark(map, place) {
                         map.geoObjects.remove(place);
                     }
 
-                    //Функция создания метки
+                    // Function to create a marker
                     function createplacemark(map, defcoord=[55.7532,37.6225]) {
                         var newmark=false;
-                        enablefields(); //Активируем выключенные поля
+                        enablefields(); // Activate disabled fields
 
                         if (!ym.map0.places.hasOwnProperty('placemark'+markcount))  {  
                             newmark=true;
                             ym.map0['places']['placemark'+markcount] = {name: '', coord: defcoord, icon: yamap_defaults['type_icon_option'], color: jQuery("#colorbox #colorbox-inp").val(), url: ''}; //: {name: 'placemark1', coord: coords, type: 'islands#blueDotIcon', color: '#ff0000', url: 'url1'};
-                            if (activeplace==='') { //Если создается первая метка, берем значения из полей формы
+                            if (activeplace==='') { // If the first marker is being created, take values from the form fields
                                 activeplace = 'placemark'+markcount; 
                                 markchange();
@@ -349 +358 @@
                         }
 
-                        
-
-
-                        //Создание метки на карте
+                        // Create a marker on the map
                         placemark[markcount] = new ymaps.Placemark(defcoord, {
                                 hintContent: "name",
@@ -371 +377 @@
                         coords = defcoord;
 
-
-
-                        //Отслеживаем событие перемещения метки
+                        // Track the event of moving the marker
                         placemark[markcount].events.add("dragend", function (e) {   
                             var trg = e.get('target');         
@@ -382 +386 @@
                         }, placemark[markcount]);
 
-                        //Отслеживаем событие начала перемещения метки
+                        // Track the event of starting to move the marker
                         placemark[markcount].events.add("dragstart", function (e) {            
                             var trg = e.get('target'); 
@@ -396 +400 @@
 
                         
-                        //Добавляем событие клика по метке
+                        // Add click event to the marker
                         placemark[markcount].events.add('click', function (e) {
 
@@ -405 +409 @@
                             enablefields();
                             
-                            //Удаляем метку-закрытия для всех меток
+                            // Remove the closing marker for all markers
                             map.geoObjects.each(function (geoObject) {
                                 if (geoObject.properties.get('id') == 'closesvg') {
@@ -413 +417 @@
                             });
 
-                            //Добавляем метку-кнопку закрытия родительской метки
+                            // Add a closing button marker for the parent marker
                             var closePlacemark = new ymaps.Placemark(
                                   plcoord,
@@ -424 +428 @@
                                     iconImageHref: url+ "/img/close.svg",
                                     iconImageSize: [16, 16],
-                                    // Описываем фигуру активной области
-                                    // "Прямоугольник".
+                                    // Describe the shape of the active area
+                                    // "Rectangle".
                                     iconOffset: [-2, -30],
                                     iconImageOffset: [5, 10],
@@ -439 +443 @@
                                 activeplace='';  
                                 inactive();                                
-                                delete ym.map0['places'][trg.properties.get('id')]; // удаляем все свойства точки из массива
+                                delete ym.map0['places'][trg.properties.get('id')]; // remove all properties of the point from the array
                                 if (Object.keys(ym.map0.places).length===0) {
-                                    //Выключаем поле с координатами
+                                    // Disable the coordinates field
                                     jQuery('#markercoord').val(yamap_object.NoCoord);
                                     enablefields(false);
@@ -447 +451 @@
                             });
 
-                            //Событие клика для закрытия метки
+                            // Click event for closing the marker
                             map.events.add('click', function (e) { 
                                 removeplacemark(map, closePlacemark);
@@ -460 +464 @@
                     }   
 
-
-
-                    //Функция инициализации карты
+                    // Function to initialize the map
                     function init () {
                             var myMap=[];
                             var controlsArr=["zoomControl", "typeSelector"];
-                            if (apikeyexist) controlsArr.push("searchControl"); //Если определен API key, добавляем поиск на карту. Без ключа он все равно не будет работать и выдавать ошибку.
+                            if (apikeyexist) controlsArr.push("searchControl"); // If the API key is defined, add search to the map. Without a key, it won't work anyway and will throw an error.
 
                             mapcenter=ym.map0.center[0];
@@ -480 +482 @@
                             }); 
 
-                        //Заполняем данные формы из массива при редактировании
+                        // Fill in the form data from the array when editing
                         function loadMap() {
                             if (ym.map0.height!=="undefined") jQuery('#mapheight').val(ym.map0.height);
@@ -487 +489 @@
                         }
 
-
-
-                        //Ставим метки редактируемой карты
+                        // Set markers for the edited map
                         function loadPlacemarks(map) {
 
@@ -507 +507 @@
                         } 
 
-                        //Отслеживаем событие щелчка по карте
+                        // Track the event of clicking on the map
                         myMap[mapcount].events.add('click', function (e) { 
                             createplacemark(myMap[mapcount], e.get('coords'));
                         }); 
 
-
-                        //Отслеживаем событие поиска и ставим метку в центр
+                        // Track the event of searching and place a marker in the center
                         if (apikeyexist) {
                             var searchControl = myMap[mapcount].controls.get('searchControl');                        
@@ -524 +523 @@
                         }
 
-
-                        //Ослеживаем событие изменения области просмотра карты - масштаб и центр карты
+                        // Track the event of changing the map view area - zoom and center of the map
                         myMap[mapcount].events.add('boundschange', function (event) {
                         if (event.get('newZoom') != event.get('oldZoom')) {     
@@ -541 +539 @@
                         maptype = myMap[mapcount].getType();                        
 
-                        //Отслеживаем изменение типа карты
+                        // Track the change of the map type
                         myMap[mapcount].events.add('typechange', function (event) {
                             maptype = myMap[mapcount].getType();
@@ -549 +547 @@
                         iconselectchange();
 
-
                         jQuery("#mapheight, #mapcontrols").change(function() {
                             mapdatechange();
@@ -557 +554 @@
                         });
 
-                        //отслеживаем изменение полей иконки  
+                        // Track the change of icon fields  
                         jQuery("#markername, #markercoord, #markericon-inp, #markerurl").change(function() {
                             markchange();
                         });   
 
-
-                        //отслеживаем изменение имени иконки  
+                        // Track the change of the icon name  
                         jQuery("#markername").change(function() {
                             if (activeplace!=="") {
@@ -570 +566 @@
                         });  
 
-
-                        //отслеживаем изменение типа иконки
+                        // Track the change of the icon type
                         jQuery("#markericon-inp").change(function() {
                             iconselectchange();
@@ -587 +582 @@
                     }
 
-                    //Параметры модального окна редактора
+                    // Parameters of the editor modal window
                     function checkApiKeyForSearchField() {
                         if (apikeyexist) {
@@ -893 +888 @@
                 mapdatechange();
                 mapSave();
-
-
-                
-
-                
             });
 
@@ -916 +906 @@
     
     tinymce.PluginManager.add("yamap_plugin", tinymce.plugins.yamap_plugin);
-
-
-    
 })();
-

yamaps/trunk/js/shortcode_parser.js

@@ -1 +1 @@
 //Парсим шорткод меток внутри карты
 function findPlaceMarks(found) {
+    if (typeof found !== 'string') return;
+    
     foundplace = found.match(/\[yaplacemark(.*?)\]/g);
-        if (foundplace!==null) {
-                for (var j = 0; j < foundplace.length; j++) {       
-                    foundplacemark=foundplace[j].match(/([a-zA-Z]+)="([^"]+)+"/gi);     
-                    ym['map0'].places['placemark'+j]={};
-                    for (var k = 0; k < foundplacemark.length; k++) {
+    if (foundplace !== null) {
+        for (var j = 0; j < foundplace.length; j++) {       
+            foundplacemark = foundplace[j].match(/([a-zA-Z]+)="([^"]+)+"/gi);     
+            ym['map0'].places['placemark'+j] = {};
+            for (var k = 0; k < foundplacemark.length; k++) {
+                foundplacemark[k] = foundplacemark[k].split("&amp;").join("&"); //Bugfix: Гутенберг меняет амперсанды на html тэги. Меняем обратно.
 
-                        foundplacemark[k]=foundplacemark[k].split("&amp;").join("&"); //Bugfix: Гутенберг меняет амперсанды на html тэги. Меняем обратно.
+                placeparams = foundplacemark[k].split("=");
+                if (placeparams.length > 2) { //Bugfix: Если строка в шорткоде содержит знак равества, не теряем ее продолжение при делении на ключ/значение
+                    placeparams[1] = foundplacemark[k].replace(placeparams[0]+"=", "");
+                }
+                placeparams[1] = placeparams[1].replace(/\"|\'/g, '');
 
-                        placeparams=foundplacemark[k].split("=");
-                        if (placeparams.length>2) { //Bugfix: Если строка в шорткоде содержит знак равества, не теряем ее продолжение при делении на ключ/значение
-                            placeparams[1]=foundplacemark[k].replace(placeparams[0]+"=", "");
+                // Безопасная обработка URL и координат
+                if (placeparams[0] === 'coord') {
+                    // Валидация координат
+                    var coords = placeparams[1].split(',');
+                    if (coords.length === 2) {
+                        var lat = parseFloat(coords[0]);
+                        var lng = parseFloat(coords[1]);
+                        if (!isNaN(lat) && !isNaN(lng) && lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180) {
+                            ym['map0'].places['placemark'+j][placeparams[0]] = lat + ',' + lng;
+                        } else {
+                            ym['map0'].places['placemark'+j][placeparams[0]] = '55.7473,37.6247'; // Дефолтные координаты
                         }
-                        placeparams[1]=placeparams[1].replace(/\"|\'/g, '');
-                        if (placeparams[0]==='coord') {
-                            ym['map0'].places['placemark'+j][placeparams[0]]=placeparams[1];
+                    } else {
+                        ym['map0'].places['placemark'+j][placeparams[0]] = '55.7473,37.6247'; // Дефолтные координаты
+                    }
+                }
+                else if (placeparams[0] === 'url') {
+                    // Безопасная обработка URL
+                    try {
+                        var url = decodeURI(placeparams[1]);
+                        // Проверяем, является ли значение числом (ID поста)
+                        if (!isNaN(url)) {
+                            ym['map0'].places['placemark'+j][placeparams[0]] = placeparams[1];
+                        } else {
+                            // Если это URL, кодируем его
+                            ym['map0'].places['placemark'+j][placeparams[0]] = encodeURI(url);
                         }
-                        else {
-                            ym['map0'].places['placemark'+j][placeparams[0]]=[placeparams[1]].join('');                            
-                        }                                            
+                    } catch(e) {
+                        ym['map0'].places['placemark'+j][placeparams[0]] = '';
                     }
+                }
+                else {
+                    ym['map0'].places['placemark'+j][placeparams[0]] = placeparams[1];
+                }
+            }
         }
     }

yamaps/trunk/languages/yamaps.pot

@@ -4 +4 @@
 "Project-Id-Version: YaMaps for Wordpress\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 19:28+0000\n"
+"POT-Creation-Date: 2025-02-05 21:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -15 +15 @@
 "X-Generator: Loco https://localise.biz/"
 
-#: options.php:282
+#: options.php:291
 msgid ""
 "<a href=\"https://developer.tech.yandex.com/services/\">Get a key</a> "
@@ -21 +21 @@
 msgstr ""
 
-#: yamap.php:397 options.php:147
+#: options.php:154 includes/admin.php:42
 msgid ""
 "<div style=\"position: relative; display: block; width: 100%; white-space: "
@@ -47 +47 @@
 msgstr ""
 
-#: yamap.php:399 options.php:150
-msgid ""
-"<div style=\"position: relative; display: block; width: 100%; white-space: "
-"normal !important;\"><h2 style=\"color: #444;font-size: 18px;font-weight: "
-"600;line-height: 36px;\">Want other plugin features?</h2>Do you like the "
-"plugin but lack features for your project? For commercial modifications of "
-"the plugin, please contact me.</div><div style=\"position: relative; display:"
-" block; width: 100%; white-space: normal !important;\"><h2 style=\"color: "
-"#444;font-size: 18px;font-weight: 600;line-height: 36px;\">WordPress website "
-"design and development</h2>My name is Yuri and I have been creating websites "
-"for over 15 years. I have been familiar with WordPress since 2008. I know "
-"and love this CMS for its user friendly interface. This is exactly how I "
-"tried to make the interface of my YaMaps plugin, which you are currently "
-"using. If you need to create a website, make an interface design or write a "
-"plugin for WordPress - I will be happy to help you!<p style=\"margin-top: ."
-"5rem; text-align: center;\"><b>Contacts:</b>  <a href=\"mailto:mail@yhunter."
-"ru\">[email protected]</a>, <b>telegram:</b> <a href=\"tg://resolve?"
-"domain=yhunter\">@yhunter</a>, <b>tel:</b> <a href=\"tel:+79028358830\">+7-"
-"902-83-588-30</a></p></div>"
-msgstr ""
-
-#: yamap.php:366
+#: includes/admin.php:10
 msgid "Add map"
 msgstr ""
 
-#: options.php:285
+#: options.php:294
 msgid "API key"
 msgstr ""
 
-#: options.php:252
+#: options.php:261
 msgid "Author link"
 msgstr ""
 
-#: options.php:244
+#: options.php:253
 msgid "Big map"
 msgstr ""
 
-#: yamap.php:372
+#: includes/admin.php:16
 msgid "Blue only"
 msgstr ""
 
-#: options.php:199
+#: options.php:208
 msgid "Choose default map type: yandex#map, yandex#satellite, yandex#hybrid"
 msgstr ""
 
-#: yamap.php:380
+#: includes/admin.php:24
 msgid "Click on the map to choose or create the mark"
 msgstr ""
 
-#: yamap.php:382
+#: includes/admin.php:26
 msgid "Delete"
 msgstr ""
 
-#: yamap.php:398
+#: includes/admin.php:41
 msgid "Design & Development"
 msgstr ""
 
-#: options.php:250
+#: options.php:259
 msgid "Disable link to plugin page"
 msgstr ""
 
-#: yamap.php:395
+#: includes/admin.php:39
 msgid ""
 "Do not create a block in the content. Use the existing block of the WP theme "
@@ -114 +93 @@
 msgstr ""
 
-#: options.php:181
+#: options.php:190
 msgid "Drag the map to set its default coordinates"
 msgstr ""
 
-#: yamap.php:367
+#: includes/admin.php:11
 msgid "Edit map"
 msgstr ""
 
-#: yamap.php:396
+#: includes/admin.php:40
 msgid "Extra"
 msgstr ""
 
-#: options.php:270
+#: options.php:279
 msgid "For example:"
 msgstr ""
 
-#: yamap.php:391 options.php:218
+#: options.php:227 includes/admin.php:35
 msgid "Full screen"
 msgstr ""
 
-#: yamap.php:392 options.php:218
+#: options.php:227 includes/admin.php:36
 msgid "Geolocation"
 msgstr ""
 
-#: yamap.php:371 options.php:264
+#: options.php:273 includes/admin.php:15
 msgid "Icon"
 msgstr ""
 
-#: yamap.php:373
+#: includes/admin.php:17
 msgid "Link"
 msgstr ""
 
-#: yamap.php:365 yamap.php:370
+#: includes/admin.php:9 includes/admin.php:14
 msgid "Map"
 msgstr ""
 
+#: options.php:193
+msgid "Map center"
+msgstr ""
+
+#: options.php:229 includes/admin.php:25
+msgid "Map controls"
+msgstr ""
+
+#: options.php:220 includes/admin.php:19
+msgid "Map height"
+msgstr ""
+
 #: options.php:184
-msgid "Map center"
-msgstr ""
-
-#: yamap.php:381 options.php:220
-msgid "Map controls"
-msgstr ""
-
-#: yamap.php:375 options.php:211
-msgid "Map height"
-msgstr ""
-
-#: options.php:175
 msgid "Map options"
 msgstr ""
 
-#: yamap.php:383 options.php:202 options.php:218
+#: options.php:211 options.php:227 includes/admin.php:27
 msgid "Map type"
 msgstr ""
 
-#: options.php:193
+#: options.php:202
 msgid "Map zoom"
 msgstr ""
 
-#: yamap.php:393 options.php:272
+#: options.php:281 includes/admin.php:37
 msgid "Marker color"
 msgstr ""
 
-#: options.php:256
+#: options.php:265
 msgid "Marker options"
 msgstr ""
 
-#: yamap.php:386 options.php:236
+#: options.php:245 includes/admin.php:30
 msgid "Mobile drag"
 msgstr ""
 
-#: options.php:242
+#: options.php:251
 msgid "Open big map/how to get button"
 msgstr ""
 
-#: options.php:262
+#: options.php:271
 msgid "Other icon types"
 msgstr ""
 
-#: yamap.php:369
+#: includes/admin.php:13
 msgid "Placemark"
 msgstr ""
 
-#: yamap.php:374
+#: includes/admin.php:18
 msgid "Placemark hyperlink url or post ID"
 msgstr ""
 
-#: yamap.php:376
+#: includes/admin.php:20
 msgid "Placemark name"
 msgstr ""
 
-#: yamap.php:394
+#: includes/admin.php:38
 msgid "Put in ID"
 msgstr ""
 
-#: options.php:289 options.php:297
+#: options.php:298 options.php:306
 msgid "Reset options"
 msgstr ""
 
-#: options.php:295
+#: options.php:304
 msgid "Restore defaults"
 msgstr ""
 
-#: yamap.php:388 options.php:218
+#: options.php:227 includes/admin.php:32
 msgid "Route"
 msgstr ""
 
-#: yamap.php:389 options.php:218
+#: options.php:227 includes/admin.php:33
 msgid "Ruler"
 msgstr ""
 
-#: yamap.php:387 options.php:218
+#: options.php:227 includes/admin.php:31
 msgid "Search"
 msgstr ""
 
-#: yamap.php:377
+#: options.php:382
+msgid "Security check failed"
+msgstr ""
+
+#: includes/admin.php:21
 msgid "Text for hint or icon content"
 msgstr ""
 
-#: options.php:234
+#: options.php:243
 msgid "The map can be dragged on mobile"
 msgstr ""
 
-#: options.php:226
+#: options.php:235
 msgid "The map can be scaled with mouse scroll"
 msgstr ""
 
-#: yamap.php:390 options.php:218
+#: options.php:227 includes/admin.php:34
 msgid "Traffic"
 msgstr ""
 
-#: yamap.php:378
+#: includes/admin.php:22
 msgid "Use the links below"
 msgstr ""
 
-#: yamap.php:385 options.php:228
+#: options.php:237 includes/admin.php:29
 msgid "Wheel zoom"
 msgstr ""
@@ -262 +245 @@
 msgstr ""
 
-#: options.php:39
+#: options.php:44
 msgid "YaMaps default options"
 msgstr ""
@@ -270 +253 @@
 msgstr ""
 
-#: yamap.php:330
+#: includes/shortcodes.php:207
 msgid "YaMaps plugin for Wordpress"
 msgstr ""
 
-#: yamap.php:368
+#: includes/admin.php:12
 msgid "YaMaps plugin: Yandex.Map"
 msgstr ""
@@ -282 +265 @@
 msgstr ""
 
-#: options.php:276
+#: options.php:285
 msgid "Yandex.Maps API key"
+msgstr ""
+
+#: options.php:31
+msgid "You do not have sufficient permissions to access this page."
 msgstr ""
 
@@ -290 +277 @@
 msgstr ""
 
-#: yamap.php:384 options.php:218
+#: options.php:227 includes/admin.php:28
 msgid "Zoom"
 msgstr ""
 
-#: options.php:190
+#: options.php:199
 msgid "Zoom the map to set its default scale"
 msgstr ""
 
-#: yamap.php:379
+#: includes/admin.php:23
 msgid "Сoordinates"
 msgstr ""

yamaps/trunk/options.php

@@ -2 +2 @@
 $yamaps_page = 'yamaps-options.php'; 
 
-global $yamaps_page, $yamaps_defaults, $yamaps_defaults_front_bak;
+global $yamaps_page, $yamaps_defaults, $yamaps_defaults_front_bak, $lang_array;
 $option_name = 'yamaps_options';
 if(get_option($option_name)){
@@ -15 +15 @@
 
 /*
- * Функция, добавляющая страницу в пункт меню Настройки
+ * Function to add a page to the Settings menu
  */
 function yamaps_options() {
@@ -24 +24 @@
  
 /**
- * Возвратная функция (Callback)
+ * Callback function
  */ 
 function yamaps_option_page(){
+    // Check user permissions
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have sufficient permissions to access this page.', 'yamaps'));
+    }
+
     global $yamaps_page, $yamaps_defaults;
     $maplocale = get_locale();
     if (strlen($maplocale)<5) $maplocale = "en_US";
     if (trim($yamaps_defaults['apikey_map_option'])<>"") {
-            $apikey='&apikey='.$yamaps_defaults['apikey_map_option'];
+            $apikey='&apikey='.esc_attr($yamaps_defaults['apikey_map_option']);
     }
     else {
@@ -37 +42 @@
     }
     ?><div class="wrap">
-        <h2><?php echo __( 'YaMaps default options', 'yamaps' ); ?></h2>
+        <h2><?php echo esc_html__('YaMaps default options', 'yamaps'); ?></h2>
         <form method="post" id="YaMapsOptions" enctype="multipart/form-data" action="options.php">
-        <?php echo'<script src="https://api-maps.yandex.ru/2.1/?lang='.$maplocale.$apikey.'" type="text/javascript"></script>'; ?>
+        <?php 
+        wp_nonce_field('yamaps_options_verify', 'yamaps_options_nonce');
+        echo '<script src="https://api-maps.yandex.ru/2.1/?lang='.esc_attr($maplocale).esc_attr($apikey).'" type="text/javascript"></script>'; ?>
             <script type="text/javascript">
-                        //Округляем координаты до 4 знаков после запятой
+                        // Round coordinates to 4 decimal places
                         function coordaprox(fullcoord) {
                                 if (fullcoord.length!==2) {
@@ -55 +62 @@
 
 
-                        //Инициализируем карту для страницы настроек
+                        // Initialize the map for the settings page
                         function init () {
                             var testvar=document.getElementById('center_map_option').value;
@@ -61 +68 @@
                             if (apikey!=="") apikeyexist=true;
                             var controlsArr=["zoomControl", "typeSelector"];
-                            if (apikeyexist) controlsArr.push("searchControl"); //Если определен API key, добавляем поиск на карту. Без ключа он все равно не будет работать и выдавать ошибку.
+                            if (apikeyexist) controlsArr.push("searchControl"); // If the API key is defined, add search to the map. Without a key, it won't work anyway and will throw an error.
 
                             var myMap0 = new ymaps.Map("yamap", {
@@ -70 +77 @@
                                 });   
 
-                            //Добавляем пример метки
+                            // Add a sample placemark
                             placemark1 = new ymaps.Placemark([<?php echo $yamaps_defaults["center_map_option"]; ?>], {
                                 hintContent: "Placemark",
@@ -78 +85 @@
                             }, {
                                 <?php 
-                                    //Проверяем, является ли поле иконки url-адресом. Если да, то ставим в качестве иконки кастомное изображение.
+                                    // Check if the icon field is a URL. If yes, set a custom image as the icon.
                                     $iconurl = strripos($yamaps_defaults["type_icon_option"], 'http');
                                     if (is_int($iconurl)) {
@@ -101 +108 @@
                             myMap0.geoObjects.add(placemark1);
 
-                            //Событие перемещения карты
+                            // Map movement event
                             myMap0.events.add('boundschange', function (event) {
-                                        //Если изменили масштаб
+                                        // If the zoom level changed
                                         if (event.get('newZoom') != event.get('oldZoom')) {     
                                             document.getElementById('zoom_map_option').value = event.get('newZoom');                                            
                                         }
-                                        //Если переместили центр
+                                        // If the center was moved
                                           if (event.get('newCenter') != event.get('oldCenter')) {
                                             document.getElementById('center_map_option').value = coordaprox(event.get('newCenter'));   
                                         }
-                                        //Помещаем метку в новый центр
+                                        // Place the marker in the new center
                                         placemark1.geometry.setCoordinates(event.get('newCenter'));                                 
                             });
-                            //Событие смены иконки
+                            // Icon change event
                             myMap0.events.add('typechange', function (event) {
                                         document.getElementById('type_map_option').value = myMap0.getType();
                             });
-                            //Cобытие поиска, скрываем метку результата
-                            if (apikeyexist) { //Баг, если нет API.ключа, то нет поискового поля и вызывает ошибку
+                            // Search event, hide the result marker
+                            if (apikeyexist) { // Bug, if there is no API key, then there is no search field and it throws an error
                                 var searchControl = myMap0.controls.get('searchControl');                        
                                 searchControl.events.add('resultshow', function (e) {
@@ -125 +132 @@
                                 });
                             }
-                            //Функция добавления элементов управления картой в поле настроек
+                            // Function to add map control elements in the settings field
                             var controlElems = document.querySelectorAll('#addcontrol a');
                             for (var i = 0; i < controlElems.length; i++) {
@@ -154 +161 @@
             </div>
             <?php 
-            settings_fields('yamaps_options'); // Идентификатор настроек плагина
+            settings_fields('yamaps_options'); // Plugin settings identifier
             do_settings_sections($yamaps_page);
             ?>
@@ -166 +173 @@
  
 /*
- * Регистрируем настройки
- * Мои настройки будут храниться в базе под названием yamaps_options (это также видно в предыдущей функции)
+ * Register settings
+ * My settings will be stored in the database under the name yamaps_options (this is also visible in the previous function)
  */
 function yamaps_option_settings() {
     global $yamaps_page;
-    // Присваиваем функцию валидации ( yamaps_validate_settings() ). Вы найдете её ниже
+    // Assign validation function ( yamaps_validate_settings() ). You will find it below
     register_setting( 'yamaps_options', 'yamaps_options', 'yamaps_validate_settings' ); // yamaps_options
  
-    // Область настроек карты
+    // Map settings area
     add_settings_section( 'map_section', __( 'Map options', 'yamaps' ), '', $yamaps_page );
  
-    // Поле центра карты
-    $yamaps_field_params = array(
-        'type'      => 'text', // тип
+    // Map center field
+    $yamaps_field_params = array(
+        'type'      => 'text', // type
         'id'        => 'center_map_option',
         'desc'      => __( 'Drag the map to set its default coordinates', 'yamaps' ), 
@@ -186 +193 @@
     add_settings_field( 'center_map_option', __( 'Map center', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
 
-    // Поле масштаба карты
-    $yamaps_field_params = array(
-        'type'      => 'text', // тип
+    // Map zoom field
+    $yamaps_field_params = array(
+        'type'      => 'text', // type
         'id'        => 'zoom_map_option',
         'desc'      => __( 'Zoom the map to set its default scale', 'yamaps' ), 
@@ -195 +202 @@
     add_settings_field( 'zoom_map_option', __( 'Map zoom', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
 
-    // Поле типа карты
-    $yamaps_field_params = array(
-        'type'      => 'text', // тип
+    // Map type field
+    $yamaps_field_params = array(
+        'type'      => 'text', // type
         'id'        => 'type_map_option',
         'desc'      => __( 'Choose default map type: yandex#map, yandex#satellite, yandex#hybrid', 'yamaps' ), 
@@ -204 +211 @@
     add_settings_field( 'type_map_option', __( 'Map type', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
 
-    // Поле высоты карты
-    $yamaps_field_params = array(
-        'type'      => 'text', // тип
+    // Map height field
+    $yamaps_field_params = array(
+        'type'      => 'text', // type
         'id'        => 'height_map_option',
         'desc'      => 'rem, em, px, %', 
@@ -214 +221 @@
 
  
-    // Поле элементов управления карты
+    // Map controls field
     $yamaps_field_params = array(
         'type'      => 'textarea',
@@ -222 +229 @@
     add_settings_field( 'controls_map_option', __( 'Map controls', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
 
-    // Чекбокс масштаба колесом
+    // Checkbox for wheel zoom
     $yamaps_field_params = array(
         'type'      => 'checkbox',
@@ -230 +237 @@
     add_settings_field( 'wheelzoom_map_option', __( 'Wheel zoom', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
 
-    // Чекбокс мобильного перетаскивания
+    // Checkbox for mobile dragging
     $yamaps_field_params = array(
         'type'      => 'checkbox',
@@ -238 +245 @@
     add_settings_field( 'mobiledrag_map_option', __( 'Mobile drag', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
 
-    // Чекбокс открытия большой карты
+    // Checkbox for opening a big map
     $yamaps_field_params = array(
         'type'      => 'checkbox',
@@ -246 +253 @@
     add_settings_field( 'open_map_option', __( 'Big map', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
 
-    // Чекбокс ссылки на автора
+    // Checkbox for author link
     $yamaps_field_params = array(
         'type'      => 'checkbox',
@@ -254 +261 @@
     add_settings_field( 'authorlink_map_option', __( 'Author link', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'map_section', $yamaps_field_params );
  
-    // Область настроек метки
+    // Marker settings area
  
     add_settings_section( 'icon_section', __( 'Marker options', 'yamaps' ), '', $yamaps_page );
  
-    // Поле типа метки
+    // Marker type field
     $yamaps_field_params = array(
         'type'      => 'text',
@@ -266 +273 @@
     add_settings_field( 'type_icon_option', __( 'Icon', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'icon_section', $yamaps_field_params );
 
-    // Поле цвета метки
+    // Marker color field
     $yamaps_field_params = array(
         'type'      => 'text',
@@ -274 +281 @@
     add_settings_field( 'color_icon_option', __( 'Marker color', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'icon_section', $yamaps_field_params );
 
-    // Область ключа API
+    // API key area
 
     add_settings_section( 'apikey_section', __( 'Yandex.Maps API key', 'yamaps' ), '', $yamaps_page );
 
-    // Поле ключа API
-    $yamaps_field_params = array(
-        'type'      => 'text', // тип
+    // API key field
+    $yamaps_field_params = array(
+        'type'      => 'text', // type
         'id'        => 'apikey_map_option',
         'desc'      => __( '<a href="https://developer.tech.yandex.com/services/">Get a key</a> (JavaScript API & HTTP Geocoder) if it necessary', 'yamaps' ), 
@@ -287 +294 @@
     add_settings_field( 'apikey_map_option', __( 'API key', 'yamaps' ), 'yamaps_option_display_settings', $yamaps_page, 'apikey_section', $yamaps_field_params );
 
-    // Область сброса настроек
+    // Reset settings area
  
     add_settings_section( 'reset_section', __( 'Reset options', 'yamaps' ), '', $yamaps_page );
 
-    // Чекбокс сброса настроек
+    // Reset settings checkbox
     $yamaps_field_params = array(
         'type'      => 'checkbox',
@@ -303 +310 @@
  
 /*
- * Функция отображения полей ввода
- * Здесь задаётся HTML и PHP, выводящий поля
+ * Function to display input fields
+ * Here is the HTML and PHP that outputs the fields
  */
 function yamaps_option_display_settings($args) {
@@ -311 +318 @@
  
     $option_name = 'yamaps_options';
-    //delete_option($option_name); //удаление настроек для тестов
+    //delete_option($option_name); // delete settings for testing
     
-    //Если настройки не найдены в БД, сохраняем туда дефолтные настройки плагина
+    // If settings are not found in the database, save the default settings of the plugin there
     if(!get_option( $option_name)){
         update_option( $option_name, $yamaps_defaults_front_bak);
     }
 
-    //Нужно перебрать настройки и поставить дефолт в отсутствующие.
+    // Need to iterate through the settings and set the default for the missing ones.
 
     $o = get_option( $option_name );
@@ -367 +374 @@
 }
 
+/*
+ * Data validation function
+ */
+function yamaps_validate_settings($input) {
+    // Check nonce
+    if (!isset($_POST['yamaps_options_nonce']) || !wp_verify_nonce($_POST['yamaps_options_nonce'], 'yamaps_options_verify')) {
+        add_settings_error('yamaps_options', 'invalid_nonce', __('Security check failed', 'yamaps'));
+        return get_option('yamaps_options');
+    }
+
+    return $input;
+}
+
 ?>

yamaps/trunk/readme.txt

@@ -102 +102 @@
 == Changelog ==
 
+= 0.6.30 =
+* Security improvements.
+* Code refactoring.
+* Fixed: Bugfix. 
+
 = 0.6.28 =
 * Fixed: Bugfix.

yamaps/trunk/style.content.css

@@ -1 @@
-.yamap_shortcode {
-    clear:both;
-    padding: .0rem 1rem 1rem 1rem;
-    border: 1px #ccc dashed;
-    overflow: hidden;
-    display: block;
-}
-
-.yamap_shortcode .content{
-    margin: 1px 0 0 0px;
-    display: inline-block;
-    float: left;
-    padding: 0;
-
-}
-
-.yamap_title {
-    font-size: .8em;
-    color: #666;
-    margin-bottom: .5em;
-    border-bottom: 1px #ccc dashed;
-    padding: .5em 0;
-}
-
-.yamap_icon {
-    display: inline-block;
-    position: relative;
-    width: 1.2em;
-    height: 1.2em;
-    background-image: url('js/img/placeholder.svg');
-    background-repeat: no-repeat;
-    opacity: .7;
-}
-
-
-.mce-container ymaps {
-        font-family: "Source Sans Pro",HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif !important;
-        font-size: 12px !important;
-}

yamaps/trunk/templates/tmpl-editor-yamap.html

@@ -1 +1 @@
 <script type="text/html" id="tmpl-editor-yamap">
+    <style>
+        .yamap_shortcode {
+            clear: both;
+            padding: .0rem 1rem 1rem 1rem;
+            border: 1px #ccc dashed;
+            overflow: hidden;
+            display: block;
+        }
+
+        .yamap_shortcode .content {
+            margin: 1px 0 0 0px;
+            display: inline-block;
+            float: left;
+            padding: 0;
+
+        }
+
+        .yamap_title {
+            font-size: .8em;
+            color: #666;
+            margin-bottom: .5em;
+            border-bottom: 1px #ccc dashed;
+            padding: .5em 0;
+        }
+
+        .yamap_icon {
+            display: inline-block;
+            position: relative;
+            width: 1.2em;
+            height: 1.2em;
+            background-image: url('js/img/placeholder.svg');
+            background-repeat: no-repeat;
+            opacity: .7;
+        }
+
+
+        .mce-container ymaps {
+            font-family: "Source Sans Pro", HelveticaNeue-Light, "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif !important;
+            font-size: 12px !important;
+        }
+    </style>
     <div class="yamap_shortcode">
         <div class="yamap_title"><span class="yamap_icon"></span> {{ data.plugin }} </div>

yamaps/trunk/yamap.php

@@ -6 +6 @@
  * Author URI:  www.yhunter.ru
  * Author:      Yuri Baranov
- * Version:     0.6.28
+ * Version:     0.6.30
  *
  *
@@ -15 +15 @@
  *
  */
-global $maps_count, $count_content, $yamap_load_api; 
 
-if (!isset($maps_count)) {
-    $maps_count=0;
+ $lang_array = array();
+
+// Load components
+require_once plugin_dir_path(__FILE__) . 'includes/init.php';
+require_once plugin_dir_path(__FILE__) . 'includes/shortcodes.php';
+require_once plugin_dir_path(__FILE__) . 'includes/api.php';
+require_once plugin_dir_path(__FILE__) . 'includes/admin.php';
+
+// Load text domain for localization
+function yamaps_plugin_load_plugin_textdomain() {
+    load_plugin_textdomain('yamaps', FALSE, basename(dirname(__FILE__)) . '/languages/');
 }
-if (!isset($count_content)) {
-    $count_content=0;
-}
+add_action('plugins_loaded', 'yamaps_plugin_load_plugin_textdomain');
 
-// Test for the first time content and single map (WooCommerce and other custom posts)
-//$count_content=0;
-$yamap_load_api=true;
-$apikey='';
-
-$yamaps_defaults_front = array(
-    'center_map_option'         => '55.7473,37.6247',
-    'zoom_map_option'           => '12',
-    'type_map_option'           => 'yandex#map',
-    'height_map_option'         => '22rem',
-    'controls_map_option'       => '',
-    'wheelzoom_map_option'      => 'off',
-    'mobiledrag_map_option'     => 'off',
-    'type_icon_option'          => 'islands#dotIcon',
-    'color_icon_option'         => '#1e98ff',
-    'authorlink_map_option'     => 'off',
-    'open_map_option'           => 'off',
-    'apikey_map_option'         => '',
-    'reset_maps_option'         => 'off',
-);  
-
-$yamaps_defaults_front_bak=$yamaps_defaults_front;
-$yamaps_defaults=$yamaps_defaults_front;
-
-//Загрузка настроек
-
-$option_name = 'yamaps_options';
-if(get_option($option_name)){
-    $yamaps_defaults_front=get_option($option_name);
-    //исправляем ошибку с дефолтными настройками 0.5.7
-    $fixpos = strripos($yamaps_defaults_front['controls_map_option'], '111');
-    if (is_int($fixpos)) {
-        $fixpattern=array('111;','111');
-        $yamaps_defaults_front['controls_map_option']=str_replace($fixpattern, '', $yamaps_defaults_front['controls_map_option']);
-        echo esc_html($yamaps_defaults_front['controls_map_option']);
-        update_option($option_name, $yamaps_defaults_front); 
-    }
-    //конец правки. Будет удалено в следующих версиях.
-}
-
-//Проверяем все ли дефолтные параметры есть в настройках плагина
-foreach($yamaps_defaults_front_bak as $yamaps_options_key => $yamaps_options_val) { 
-    if(!isset($yamaps_defaults_front[$yamaps_options_key])) {
-        $yamaps_defaults_front[$yamaps_options_key]=$yamaps_defaults_front_bak[$yamaps_options_key];
-    }
-}
-
-//Добавляем счетчик полей с контентом (для постов с произвольными полями)
-add_filter( 'the_content', 'yamaps_the_content'); 
-add_filter('widget_text', 'yamaps_the_content');
-add_filter('requirement', 'yamaps_the_content');
-
-function yamaps_the_content( $content ) {
-    global $count_content;
-    $count_content++;
-    return $content;
-}
-
-//Новый вызов Yandex Map API. Если передаем true, отдается только адрес API с локалью и API-ключем. Нужно для альтернативного подключения API, при отсутствии wp_footer
-function YandexMapAPI_script($noFooter = false) {  
-        global $yamaps_defaults_front, $apikey, $post;
-        $maplocale = get_locale();
-        if (strlen($maplocale)<5) $maplocale = "en_US";
-        if (trim($yamaps_defaults_front['apikey_map_option'])<>"") {
-            $apikey='&apikey='.esc_html($yamaps_defaults_front['apikey_map_option']);
-        }
-        else {
-            $apikey = '';
-        }
-        if ($noFooter) {
-            $AltApiSrc = 'https://api-maps.yandex.ru/2.1/?lang='.esc_html($maplocale).esc_html($apikey).'&ver=2.1';
-            $AltApiSrc = str_replace("&amp;", "&", $AltApiSrc);
-            return $AltApiSrc;
-        }
-        else {
-            if ( is_a( $post, 'WP_Post' ) && has_shortcode( $post->post_content, 'yamap') ) {
-                // Register the script like this for a plugin:  
-                wp_register_script( 'YandexMapAPI', 'https://api-maps.yandex.ru/2.1/?lang='.esc_html($maplocale).esc_html($apikey), [], 2.1, true );  
-
-                // For either a plugin or a theme, you can then enqueue the script:  
-                wp_enqueue_script( 'YandexMapAPI' ); 
-            }    
-        }
-         
-}
-
-//Функция добавления метки на карту
-function yaplacemark_func($atts) {
-    $atts = shortcode_atts( array(
-        'coord' => '',
-        'name' => '',
-        'color' => 'blue',
-        'url' => '',
-        'icon' => 'islands#dotIcon',
-    ), $atts );
-
-    global $yaplacemark_count, $maps_count;
-    $yaplacemark_count++;
-    $yahint="";
-    $yacontent="";
-    $yaicon=trim(esc_html($atts["icon"]));
-
-
-    if (strstr($yaicon, "Stretchy")<>FALSE) {
-        $yahint="";
-        $yacontent=sanitize_text_field($atts["name"]);
-        }
-    else {
-            if (($yaicon==="islands#blueIcon")or($yaicon==="islands#blueCircleIcon")) {
-                $yahint=esc_html($atts["name"]);
-                $yacontent=esc_html(mb_substr($yahint, 0, 1));
-            }
-            else {
-                $yahint=esc_html($atts["name"]);
-                $yacontent="";
-            }
-    }
-    
-    
-    $yaplacemark='
-        YaMapsWP.myMap'.$maps_count.'.places.placemark'.$yaplacemark_count.' = {icon: "'.esc_js($atts["icon"]).'", name: "'.esc_js($atts["name"]).'", color: "'.esc_js($atts["color"]).'", coord: "'.esc_js($atts["coord"]).'", url: "'.esc_url($atts["url"]).'",};
-        myMap'.$maps_count.'placemark'.$yaplacemark_count.' = new ymaps.Placemark(['.$atts["coord"].'], {
-                                hintContent: "'.esc_js($yahint).'",
-                                iconContent: "'.esc_js($yacontent).'",
-
-
-                              
-                            }, {';
-    //Проверяем, является ли поле иконки url-адресом. Если да, то ставим в качестве иконки кастомное изображение.
-    $iconurl = strripos($atts["icon"], 'http');
-    if (is_int($iconurl)) {
-        $yaplacemark.='                        
-                                iconLayout: "default#image",
-                                iconImageHref: "'.esc_js($atts["icon"]).'"
-                            });  
-        ';
-
-    }
-    else {
-        $yaplacemark.='                        
-                                preset: "'.esc_js($atts["icon"]).'", 
-                                iconColor: "'.esc_js($atts["color"]).'",
-                            });  
-        ';
-    }
-    
-    $atts["url"]=trim(esc_js($atts["url"]));
-    if (($atts["url"]<>"")and($atts["url"]<>"0")) {
-        $marklink=$atts["url"];
-        settype($marklink, "integer");
-        if ($marklink<>0) {
-            $marklink=get_the_permalink(esc_js($atts["url"]));
-            $yaplacemark.='YaMapsWP.myMap'.$maps_count.'.places["placemark'.$yaplacemark_count.'"].url="'.$marklink.'"';
-        }
-        else {
-            $marklink=$atts["url"];
-        }
-        $yaplacemark.=' 
-                YMlisteners.myMap'.$maps_count.'['.$yaplacemark_count.'] = myMap'.$maps_count.'placemark'.$yaplacemark_count.'.events.group().add("click", function(e) {yamapsonclick("'.esc_url($marklink).'")});
-
-        ';
-    }
-    return $yaplacemark;
-}
-
-//Функция вывода карты
-function yamap_func($atts, $content){
-    global $yaplacemark_count, $yamaps_defaults_front, $yamaps_defaults_front_bak, $yacontrol_count, $maps_count, $count_content, $yamap_load_api, $suppressMapOpenBlock, $yamap_onpage;
-
-    $placearr = '';
-    $atts = shortcode_atts( array(
-        'center' => esc_js($yamaps_defaults_front['center_map_option']),
-        'zoom' => esc_js($yamaps_defaults_front['zoom_map_option']),
-        'type' => 'map',
-        'height' => esc_js($yamaps_defaults_front['height_map_option']),
-        'controls' => esc_js($yamaps_defaults_front['controls_map_option']),
-        'scrollzoom' => '1',
-        'mobiledrag' => '1',
-        'container' => '',
-
-    ), $atts );
-    
-    $yaplacemark_count=0;
-    $yacontrol_count=0;
-    $yamap_onpage=true;
-
-    $yamactrl=str_replace(';', '", "', esc_js($atts["controls"]));
-
-    if (trim($yamactrl)<>"") $yamactrl='"'.$yamactrl.'"';
-
-    if (($yamap_load_api)) { // First time content and single map
-        if (trim($yamaps_defaults_front['apikey_map_option'])<>"") {
-            $apikey='&apikey='.esc_js($yamaps_defaults_front['apikey_map_option']);
-        }
-        else {
-            $apikey = '';
-        }
-
-        $yamap='
-        <script>
-            if (typeof(YaMapsWP) === "undefined") {
-                var YaMapsWP = {}, YMlisteners = {};
-                var YaMapsScript = document.createElement("script");    
-                var YaMapsScriptCounter = [];                   
-            }
-            var myMap'.$maps_count.';           
-        </script>';
-    }
-    else {
-        $yamap='';
-    }
-    
-    $placemarkscode=str_replace("&nbsp;", "", strip_tags($content));
-
-    $atts["container"]=trim($atts["container"]);
-    if ($atts["container"]<>"") {
-        $mapcontainter=esc_html($atts["container"]);
-        $mapcontainter=str_replace("#", "", $mapcontainter);
-    }
-    else {
-        $mapcontainter='yamap'.$maps_count;
-    }   
-    
-    // Проверяем опцию включения кнопки большой карты
-    if ($yamaps_defaults_front['open_map_option']<>'on') {
-        $suppressMapOpenBlock='true'; 
-    }
-    else {
-        $suppressMapOpenBlock='false';
-    }
-    //1. Дожидаемся загрузки всей страницы для инициализации карты
-    //2. Проверяем, подключился ли API в wp_footer по ID "YandexMapAPI-js" (wp_footer может не оказаться в кастомных шаблонах)
-    //3. Если нет, запускаем функцию альтернативного подключения API - AltApiLoad, подключаем скрипт с ID "YandexMapAPI-alt-js"
-    //4. Функцию инициализации каждой карты на странице записываем в массив YaMapsScriptCounter и, после загрузки скрипта, поочередно инициализируем
-    $yamap.='
-                        <script type="text/javascript">                                     
-                        document.addEventListener("DOMContentLoaded", function() { 
-                           if (document.getElementById("YandexMapAPI-js") == null ) {
-                                YaMapsScriptCounter.push(function() {ymaps.ready(init)});
-                                if (document.getElementById("YandexMapAPI-alt-js") == null ) { 
-                                    function AltApiLoad(src){
-
-                                      YaMapsScript.id = "YandexMapAPI-alt-js";
-                                      YaMapsScript.src = src;
-                                      YaMapsScript.async = false;
-                                      document.head.appendChild(YaMapsScript);
-
-                                    }
-
-                                    AltApiLoad("'.YandexMapAPI_script(true).'");
-
-                                    window.onload = function() {
-                                        YaMapsScriptCounter.forEach(function(entryFunc) {
-                                            entryFunc();
-                                        });
-                                    }
-                                }
-
-                                
-
-                           } 
-                           else {
-                                ymaps.ready(init); 
-                           }
-                           
-                            
-                            YMlisteners.myMap'.$maps_count.' = {};
-                            YaMapsWP.myMap'.$maps_count.' = {center: "'.esc_js($atts["center"]).'", zoom: "'.esc_js($atts["zoom"]).'", type: "'.esc_js($atts["type"]).'", controls: "'.esc_js($atts["controls"]).'", places: {}};
-
-                            var yamapsonclick = function (url) {
-                                location.href=url;
-                            }                        
-
-                            function init () {
-                                myMap'.$maps_count.' = new ymaps.Map("'.$mapcontainter.'", {
-                                        center: ['.sanitize_text_field($atts["center"]).'],
-                                        zoom: '.sanitize_text_field($atts["zoom"]).',
-                                        type: "'.sanitize_text_field($atts["type"]).'",
-                                        controls: ['.sanitize_text_field($yamactrl).'] ,
-                                        
-                                    },
-                                    {
-                                        suppressMapOpenBlock: '.esc_js($suppressMapOpenBlock).'
-                                    }); 
-
-                                '.do_shortcode($placemarkscode);                            
-                                
-                                for ($i = 1; $i <= $yaplacemark_count; $i++) {
-                                    $placearr.='.add(myMap'.$maps_count.'placemark'.$i.')';
-                                }
-                                $yamap.='myMap'.$maps_count.'.geoObjects'.$placearr.';';
-                                if ($atts["scrollzoom"]=="0") $yamap.="myMap".$maps_count.".behaviors.disable('scrollZoom');";
-                                //Если у карты mobiledrag=0, отключаем прокрутку карты для следующих платформ
-                                if ($atts["mobiledrag"]=="0") {
-                                    $yamap.="
-                                    if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Kindle|Silk|Opera Mini/i.test(navigator.userAgent)) {
-                                        myMap".$maps_count.".behaviors.disable('drag'); 
-                                    }";
-                                }
-                                $yamap.='
-
-                            }
-                        }, false);
-                    </script>
-                    
-    ';
-    $authorLinkTitle=__( 'YaMaps plugin for Wordpress', 'yamaps' );
-
-    if($yamaps_defaults_front['authorlink_map_option']<>'on'){
-        
-    $authorlink='<div style="position: relative; height: 0;  margin-bottom: 1rem !important; margin-top:0 !important; overflow: visible; width: 100%; text-align: center; top: -32px;"><a href="https://www.yhunter.ru/portfolio/dev/yamaps/" title="'.esc_attr($authorLinkTitle).'" target="_blank" style="display: inline-block; -webkit-box-align: center; padding: 3.5px 5px; text-decoration: none !important; border-bottom: 0; border-radius: 3px; background-color: #fff; cursor: pointer; white-space: nowrap; box-shadow: 0 1px 2px 1px rgba(0,0,0,.15),0 2px 5px -3px rgba(0,0,0,.15);"><img src="'.plugins_url( 'js/img/placeholder.svg' , __FILE__ ).'" alt="" style="width: 17px; height: 17px; margin: 0; display: block;" /></a></div>';
-    }
-    else {
-        $authorlink="";
-    }
-    if ($atts["container"]=="") $yamap.='<div id="'.esc_attr($mapcontainter).'"  style="position: relative; height: '.esc_attr($atts["height"]).'; margin-bottom: 0 !important;"></div>'.$authorlink;
-
-    if ($count_content>=1) $maps_count++;
-    return $yamap; 
-}
-
-add_shortcode( 'yaplacemark', 'yaplacemark_func' );  
-add_shortcode( 'yamap', 'yamap_func' ); 
-add_shortcode( 'yacontrol', 'yacontrol_func' ); 
-
-//Функция подключения текстового домена для локализации
-function yamaps_plugin_load_plugin_textdomain() {
-    load_plugin_textdomain( 'yamaps', FALSE, basename( dirname( __FILE__ ) ) . '/languages/' );
-}
-add_action( 'plugins_loaded', 'yamaps_plugin_load_plugin_textdomain' );
-
-
-// Функция подключения скриптов и массив для локализации
-function yamap_plugin_scripts($plugin_array)
-{
-    
-    // Plugin localization
-
-    wp_register_script('yamap_plugin', plugin_dir_url(__FILE__) . 'js/shortcode_parser.js?v=0.2');
-    wp_enqueue_script('yamap_plugin');
-    
-    $lang_array  = array('YaMap' => __('Map', 'yamaps'),
-                         'AddMap' => __('Add map', 'yamaps'),
-                         'EditMap' => __('Edit map', 'yamaps'),
-                         'PluginTitle' => __('YaMaps plugin: Yandex.Map', 'yamaps'),
-                         'MarkerTab' => __('Placemark', 'yamaps'),
-                         'MapTab' => __('Map', 'yamaps'),
-                         'MarkerIcon' => __('Icon', 'yamaps'),
-                         'BlueOnly' => __('Blue only', 'yamaps'),
-                         'MarkerUrl' => __('Link', 'yamaps'),
-                         'MarkerUrlTip' => __('Placemark hyperlink url or post ID', 'yamaps'),
-                         'MapHeight' => __('Map height', 'yamaps'),
-                         'MarkerName' => __('Placemark name', 'yamaps'),
-                         'MarkerNameTip' => __('Text for hint or icon content', 'yamaps'),
-                         'MapControlsTip' => __('Use the links below', 'yamaps'),       
-                         'MarkerCoord' => __('Сoordinates', 'yamaps'),
-                         'NoCoord' => __('Click on the map to choose or create the mark', 'yamaps'),
-                         'MapControls' => __('Map controls', 'yamaps'),
-                         'MarkerDelete' => __('Delete', 'yamaps'),
-                         'type' => __('Map type', 'yamaps'),
-                         'zoom' => __('Zoom', 'yamaps'),
-                         'ScrollZoom' => __('Wheel zoom', 'yamaps'),
-                         'MobileDrag' => __('Mobile drag', 'yamaps'),
-                         'search' => __('Search', 'yamaps'),
-                         'route' => __('Route', 'yamaps'),
-                         'ruler' => __('Ruler', 'yamaps'),
-                         'traffic' => __('Traffic', 'yamaps'),
-                         'fullscreen' => __('Full screen', 'yamaps'),
-                         'geolocation' => __('Geolocation', 'yamaps'),
-                         'MarkerColor' => __('Marker color', 'yamaps'),
-                         'MapContainerID' => __('Put in ID', 'yamaps'),
-                         'MapContainerIDTip' => __('Do not create a block in the content. Use the existing block of the WP theme with the specified ID', 'yamaps'),
-                         'Extra' => __('Extra', 'yamaps'),
-                         'ExtraHTML' => __('<div style="position: relative; display: block; width: 100%; white-space: normal !important;"><h2 style="color: #444;font-size: 18px;font-weight: 600;line-height: 36px;">Want other icon types?</h2>Additional types of icons can be found by the link in the <a href="https://tech.yandex.com/maps/doc/jsapi/2.1/ref/reference/option.presetStorage-docpage/ " style="white-space: normal">Yandex.Map documentation</a>.</div><div style="position: relative; display: block; width: 100%; white-space: normal !important;"><h2 style="color: #444;font-size: 18px;font-weight: 600;line-height: 36px;">Do you like YaMaps plugin?</h2>You can support its development by donate (<a href="https://yoomoney.ru/to/41001278340150" style="white-space: normal">Yoomoney</a>) or just leave a positive feedback in the <a href="https://wordpress.org/support/plugin/yamaps/reviews/" style="white-space: normal">plugin repository</a>. It\'s very motivating!</div><div style="position: relative; display: block; width: 100%; white-space: normal !important;"><h2 style="color: #444;font-size: 18px;font-weight: 600;line-height: 36px;">Any questions?</h2>Ask in the comments <a href="https://www.yhunter.ru/portfolio/dev/yamaps/" style="white-space: normal">on the plug-in\'s page</a>, <a href="https://wordpress.org/support/plugin/yamaps" style="white-space: normal">WP support forum</a> or <a href="https://github.com/yhunter-ru/yamaps/issues" style="white-space: normal">on GitHub</a>.</div>', 'yamaps'),
-                            'DeveloperInfoTab' => __('Design & Development', 'yamaps'),
-                            'DeveloperInfo' => __('<div style="position: relative; display: block; width: 100%; white-space: normal !important;"><h2 style="color: #444;font-size: 18px;font-weight: 600;line-height: 36px;">Want other plugin features?</h2>Do you like the plugin but lack features for your project? For commercial modifications of the plugin, please contact me.</div><div style="position: relative; display: block; width: 100%; white-space: normal !important;"><h2 style="color: #444;font-size: 18px;font-weight: 600;line-height: 36px;">WordPress website design and development</h2>My name is Yuri and I have been creating websites for over 15 years. I have been familiar with WordPress since 2008. I know and love this CMS for its user friendly interface. This is exactly how I tried to make the interface of my YaMaps plugin, which you are currently using. If you need to create a website, make an interface design or write a plugin for WordPress - I will be happy to help you!<p style="margin-top: .5rem; text-align: center;"><b>Contacts:</b>  <a href="mailto:[email protected]">[email protected]</a>, <b>telegram:</b> <a href="tg://resolve?domain=yhunter">@yhunter</a>, <b>tel:</b> <a href="tel:+79028358830">+7-902-83-588-30</a></p></div>', 'yamaps'),
-
-                        );
-
-
-
-    
-    wp_localize_script('yamap_plugin', 'yamap_object', $lang_array); 
-
-    global $yamaps_defaults_front;
-    wp_localize_script('yamap_plugin', 'yamap_defaults', $yamaps_defaults_front); 
-
-    //enqueue TinyMCE plugin script with its ID.
-
-    $plugin_array["yamap_plugin"] =  plugin_dir_url(__FILE__) . "js/btn.js?v=0.34";
-
-    return $plugin_array;
-
-}
-
-
-
-
-add_filter("mce_external_plugins", "yamap_plugin_scripts", 999 );
-
-//Функция регистрации кнопок в редакторе
-function register_buttons_editor($buttons)
-{
-    //register buttons with their id.
-    array_push($buttons, "yamap");
-    return $buttons;
-}
-
-
-add_filter("mce_buttons", "register_buttons_editor", 999 );
-
-add_action('admin_head', 'yamaps_custom_fonts', 999 );
-
-//Исправляем проблему со съехавшим шрифтом в Stretchy метке на карте в редакторе
-function yamaps_custom_fonts() {            
-      echo '<style>
-        .mce-container ymaps {          
-            font-family: "Source Sans Pro",HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif !important;
-            font-size: 11px !important;
-        }
-      </style>';
-}
-
-
-//Подключаем шаблон шорткода
-function yamaps_shortcode_tmpl() {
-    //Подключаем шаблон правки шорткода
-    include_once dirname(__FILE__).'/templates/tmpl-editor-yamap.html';
-}
-
-add_action('admin_head', 'yamaps_shortcode_tmpl');
-
-//Подключаем внешние стили
-function yamap_mce_css( $mce_css ) {
-  if ( !empty( $mce_css ) )
-    $mce_css .= ',';
-    $mce_css .= plugins_url( 'style.content.css', __FILE__ );
-    return $mce_css;
-  }
-add_filter( 'mce_css', 'yamap_mce_css' );
-
-//Подключаем стили для нового редактора Gutenberg
-function yamaps_gutenberg_styles() {
-    // Load the theme styles within Gutenberg.
-     wp_enqueue_style( 'yamaps-gutenberg', plugins_url( 'style.content.css', __FILE__ ));
-}
-add_action( 'enqueue_block_editor_assets', 'yamaps_gutenberg_styles' );
-
-
-if (($yamap_load_api)) {  
-    add_action( 'wp_enqueue_scripts', 'YandexMapAPI_script', 5 );
-} 
-
-include( plugin_dir_path( __FILE__ ) . 'options.php'); 
+// Load options
+require_once plugin_dir_path(__FILE__) . 'options.php';