Merge pull request #15 from dle-modules/3.0.0

3.0.0

.gitignore

@@ -0,0 +1,246 @@
+# Redactors
+/.idea/
+
+
+# Installed DLE
+/engine/cache/*.tmp
+/engine/cache/system/*.php
+/engine/data/*.txt
+/engine/data/*.php
+
+# DLE 11.1 sources
+/.htaccess
+/admin.php
+/backup/.htaccess
+/backup/index.html
+/cron.php
+/engine/ajax/addcomments.php
+/engine/ajax/adminfunction.php
+/engine/ajax/allvotes.php
+/engine/ajax/antivirus.php
+/engine/ajax/bbcode.php
+/engine/ajax/calendar.php
+/engine/ajax/clean.php
+/engine/ajax/comments.php
+/engine/ajax/complaint.php
+/engine/ajax/deletecomments.php
+/engine/ajax/editcomments.php
+/engine/ajax/editnews.php
+/engine/ajax/favorites.php
+/engine/ajax/feedback.php
+/engine/ajax/find_relates.php
+/engine/ajax/find_tags.php
+/engine/ajax/keywords.php
+/engine/ajax/message.php
+/engine/ajax/newsletter.php
+/engine/ajax/pm.php
+/engine/ajax/poll.php
+/engine/ajax/profile.php
+/engine/ajax/quote.php
+/engine/ajax/rating.php
+/engine/ajax/ratingcomments.php
+/engine/ajax/rebuild.php
+/engine/ajax/registration.php
+/engine/ajax/replycomments.php
+/engine/ajax/rss.php
+/engine/ajax/search.php
+/engine/ajax/sitemap.php
+/engine/ajax/templates.php
+/engine/ajax/typograf.php
+/engine/ajax/updates.php
+/engine/ajax/upload.php
+/engine/ajax/vote.php
+/engine/api/
+/engine/cache/*
+/engine/cache/system/*
+/engine/classes/.htaccess
+/engine/classes/antivirus.class.php
+/engine/classes/calendar/calendar.css
+/engine/classes/calendar/calendar.js
+/engine/classes/comments.class.php
+/engine/classes/download.class.php
+/engine/classes/flashplayer/*
+/engine/classes/google.class.php
+/engine/classes/highlight/
+/engine/classes/highslide/
+/engine/classes/html5player/*
+/engine/classes/js/*
+/engine/classes/mail.class.php
+/engine/classes/mail/class.phpmailer.php
+/engine/classes/masha/*
+/engine/classes/min/*
+/engine/classes/mobiledetect.class.php
+/engine/classes/mysql.php
+/engine/classes/parse.class.php
+/engine/classes/recaptcha.php
+/engine/classes/rss.class.php
+/engine/classes/social.class.php
+/engine/classes/stopspam.class.php
+/engine/classes/templates.class.php
+/engine/classes/thumb.class.php
+/engine/classes/typograf.class.php
+/engine/classes/uploads/*
+/engine/data/.htaccess
+/engine/data/emoticons/*
+/engine/download.php
+/engine/editor/*
+/engine/engine.php
+/engine/go.php
+/engine/inc/.htaccess
+/engine/inc/addnews.php
+/engine/inc/banners.php
+/engine/inc/blockip.php
+/engine/inc/categories.php
+/engine/inc/check.php
+/engine/inc/clean.php
+/engine/inc/cmoderation.php
+/engine/inc/comments.php
+/engine/inc/complaint.php
+/engine/inc/dboption.php
+/engine/inc/dumper.php
+/engine/inc/editnews.php
+/engine/inc/editusers.php
+/engine/inc/editvote.php
+/engine/inc/email.php
+/engine/inc/files.php
+/engine/inc/googlemap.php
+/engine/inc/help.php
+/engine/inc/include/.htaccess
+/engine/inc/include/functions.inc.php
+/engine/inc/include/init.php
+/engine/inc/include/inserttag.php
+/engine/inc/iptools.php
+/engine/inc/links.php
+/engine/inc/logs.php
+/engine/inc/main.php
+/engine/inc/mass_static_actions.php
+/engine/inc/mass_user_actions.php
+/engine/inc/massactions.php
+/engine/inc/newsletter.php
+/engine/inc/options.php
+/engine/inc/preview.php
+/engine/inc/question.php
+/engine/inc/rebuild.php
+/engine/inc/rss.php
+/engine/inc/rssinform.php
+/engine/inc/search.php
+/engine/inc/social.php
+/engine/inc/static.php
+/engine/inc/tagscloud.php
+/engine/inc/templates.php
+/engine/inc/userfields.php
+/engine/inc/usergroup.php
+/engine/inc/videoconfig.php
+/engine/inc/wordfilter.php
+/engine/inc/xfields.php
+/engine/init.php
+/engine/modules/.htaccess
+/engine/modules/addcomments.php
+/engine/modules/addnews.php
+/engine/modules/antibot/*
+/engine/modules/banned.php
+/engine/modules/banners.php
+/engine/modules/bbcode.php
+/engine/modules/calendar.php
+/engine/modules/changemail.php
+/engine/modules/comments.php
+/engine/modules/cron.php
+/engine/modules/deletenews.php
+/engine/modules/favorites.php
+/engine/modules/feedback.php
+/engine/modules/functions.php
+/engine/modules/lastcomments.php
+/engine/modules/links.php
+/engine/modules/lostpassword.php
+/engine/modules/main.php
+/engine/modules/offline.php
+/engine/modules/pm.php
+/engine/modules/pm_alert.php
+/engine/modules/poll.php
+/engine/modules/profile.php
+/engine/modules/register.php
+/engine/modules/rssinform.php
+/engine/modules/search.php
+/engine/modules/show.custom.php
+/engine/modules/show.full.php
+/engine/modules/show.short.php
+/engine/modules/sitelogin.php
+/engine/modules/social.php
+/engine/modules/static.php
+/engine/modules/stats.php
+/engine/modules/tagscloud.php
+/engine/modules/topnews.php
+/engine/modules/vote.php
+/engine/opensearch.php
+/engine/preview.php
+/engine/print.php
+/engine/rss.php
+/engine/skins/.htaccess
+/engine/skins/codemirror/css/default.css
+/engine/skins/codemirror/js/LICENSE
+/engine/skins/codemirror/js/code.js
+/engine/skins/default.skin.php
+/engine/skins/fonts/*
+/engine/skins/images/*
+/engine/skins/javascripts/application.js
+/engine/skins/stylesheets/application.css
+/engine/skins/stylesheets/frame.css
+/index.php
+/install.php
+/language/.htaccess
+/language/Russian/admincheck.lng
+/language/Russian/adminlogs.lng
+/language/Russian/adminpanel.lng
+/language/Russian/help.lng
+/language/Russian/website.lng
+/robots.txt
+/templates/.htaccess
+/templates/Default/*
+/templates/Gemini/*
+/templates/Green/*
+/templates/Pisces/*
+/templates/Red/*
+/templates/banned.tpl
+/templates/opensearch.tpl
+/templates/rss.tpl
+/templates/smartphone/*
+/upgrade/*
+/uploads/*
+
+# DLE 11.3 sources
+/engine/ajax/commentssubscribe.php
+/engine/ajax/twofactor.php
+/engine/classes/htmlpurifier/*
+/engine/classes/memcache.class.php
+/engine/inc/lostpassword.php
+/engine/inc/redirects.php
+/engine/inc/twofactor.php
+
+# DLE 12 sources
+/engine/inc/metatags.php
+/language/English/admincheck.lng
+/language/English/adminlogs.lng
+/language/English/adminpanel.lng
+/language/English/help.lng
+/language/English/website.lng
+
+# DLE 13 sources
+/engine/ajax/controller.php
+/engine/ajax/plugins.php
+/engine/classes/plugins.class.php
+/engine/classes/zipextract.class.php
+/engine/inc/plugins.php
+/engine/inc/upgrade.php
+/engine/inc/upgrade
+
+# DLE 14 sources
+/engine/classes/tinify/
+
+# YandexMaps
+!/engine/skins/images/ymaps.png
+!/CHANGELOG.md
+!/engine/data/ymaps_icons.json
+!/engine/data/ymaps_config.json
+!/engine/inc/ymaps.php
+!/engine/modules/ymaps/
+!/templates/{THEME}/

CHANGELOG.md

@@ -1,5 +1,19 @@
-##v2.0.1 от 16.10.2018
+## 3.0.0 
+- Установка в виде плагина.
+- Теперь изменения в модуль можно делать самостоятельно через систему плагинов.
+- Прекращена поддержка старых версий DLE (ниже, чем версии 13.x).
+- Убрана Украинская локализация т.к. Яндекс заблокирован на территории Украины.
+- Убрана Английская локализация т.к. никто не пользуется этой версией.
+- Обновлена поддержка тегов `[image-X]{image-X}[/image-X]`. 
+- Обновлена поддержка тегов `[fullimage-X]{fullimage-X}[/fullimage-X]`.
+- Добавлена поддержка тегов `[not-image-X]...[/not-image-X]`. 
+- Добавлена поддержка тегов `[not-fullimage-X]...[/not-fullimage-X]`.
+- Добавлено поле для указания apiKey для использования функций геокодинга на карте (поиск, определение позиции пользователя) (fixed #12).
+- Исправлено некорректное отображение кнопок в админке DLE 13.X (fixed #10).
+- Исправлена некорректная работа JS во время манипуляций с картой при добавлении новости (fixed #8).
+
+## 2.0.1 от 16.10.2018
 - Совместимость с DLE 13.X
 
-##v2.0.0 от 09.05.2017
+## 2.0.0 от 09.05.2017
 - Открытие исходников оригинального модуля для бесплатного использования.

README.md

@@ -1,18 +1,23 @@
 # Yandex Maps - модуль Яндекс карт для DLE
 
-![version](https://img.shields.io/badge/version-2.0.1-red.svg?style=flat-square "Version")
-![DLE](https://img.shields.io/badge/DLE-10.X-green.svg?style=flat-square "DLE Version")
+![version](https://img.shields.io/badge/version-3.0.0-red.svg?style=flat-square "Version")
+![DLE](https://img.shields.io/badge/DLE-13.X-green.svg?style=flat-square "DLE Version")
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/dle-modules/DLE-YandexMaps/blob/master/LICENSE)
 
 **Модуль DLE Yandex Maps** предназначен для вывода в полной новости блока с Яндекс.Картой и точкой на ней, координаты и зум которой хранятся в дополнительном поле новости, а так же вывода, отфильтрованного по параметрам, JSON-массива с информацией о координатах точек с привязкой этих точек к соответсвующим новостям, для последующего размещения на Яндекс.Карте.
 
 ## Требования к системе
-- Версия DLE: **10.X и выше**
+- Версия DLE: **13.X и выше**
 - Поддерживаемая кодировка: **UTF-8**
 - Версия php: **5.4 и выше**
 
-## [Установка модуля](http://maps.pafnuty.name/documentation/#install)
+## Установка модуля
+Устанавливаем как обычный плагин, файл ymaps_plugin.zip содержит всё необходимое для автоматической установки.
 
-## [Документация](http://maps.pafnuty.name)
+## Настройка модуля
+http://maps.pafnuty.name/documentation/#setup
+
+## Документация
+http://maps.pafnuty.name
 
 

dle-yandexmaps.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dleplugin>
+	<name>DLE-YandexMaps</name>
+	<description>Яндекс карты для DLE</description>
+	<icon>engine/skins/images/ymaps.png</icon>
+	<version>3.0.0</version>
+	<dleversion>13</dleversion>
+	<versioncompare>greater</versioncompare>
+	<upgradeurl>https://updates.pafnuty.name/check-ymaps.php</upgradeurl>
+	<filedelete>0</filedelete>
+	<needplugin></needplugin>
+	<mnotice>1</mnotice>
+	<mysqlinstall><![CDATA[]]></mysqlinstall>
+	<mysqlupgrade><![CDATA[]]></mysqlupgrade>
+	<mysqlenable><![CDATA[INSERT INTO `{prefix}_admin_sections` (`name`, `title`, `descr`, `icon`, `allow_groups`) VALUES ('ymaps', 'Yandex Maps', 'Модуль Яндекс.Карты для DLE', 'engine/skins/images/ymaps.png', '1');]]></mysqlenable>
+	<mysqldisable><![CDATA[DELETE from `{prefix}_admin_sections` WHERE name = 'ymaps';]]></mysqldisable>
+	<mysqldelete><![CDATA[DELETE from `{prefix}_admin_sections` WHERE name = 'ymaps';]]></mysqldelete>
+	<phpinstall><![CDATA[]]></phpinstall>
+	<phpupgrade><![CDATA[]]></phpupgrade>
+	<phpenable><![CDATA[]]></phpenable>
+	<phpdisable><![CDATA[]]></phpdisable>
+	<phpdelete><![CDATA[]]></phpdelete>
+	<notice><![CDATA[<a href="https://github.com/dle-modules/DLE-YandexMaps/releases/latest" target="_blank">Release notes</a>]]></notice>
+	<file name="engine/inc/addnews.php">
+		<operation action="after">
+			<searchcode><![CDATA[echoheader( "<i class=\"fa fa-file-text-o position-left\"></i><span class=\"text-semibold\">{$lang['header_n_title']}</span>", $lang['addnews'] );]]></searchcode>
+			<replacecode><![CDATA[echo '<link rel="stylesheet" href="engine/modules/ymaps/css/ymaps_editnews.css?v=3.0.0"><script src="engine/modules/ymaps/js/ymaps_editnews.js?v=3.0.0"></script><script>jQuery(document).ready(function($) {loadController();});</script>';]]></replacecode>
+		</operation>
+	</file>
+	<file name="engine/inc/editnews.php">
+		<operation action="before">
+			<searchcode><![CDATA[if ( !$user_group[$member_id['user_group']]['allow_html'] ) $config['allow_admin_wysiwyg'] = 0;]]></searchcode>
+			<replacecode><![CDATA[echo '<link rel="stylesheet" href="engine/modules/ymaps/css/ymaps_editnews.css?v=3.0.0"><script src="engine/modules/ymaps/js/ymaps_editnews.js?v=3.0.0"></script><script>jQuery(document).ready(function($) {loadController();});</script>';]]></replacecode>
+		</operation>
+	</file>
+</dleplugin>