From 02227d1e3e28601d6a38ab42b81b1298dae598a2 Mon Sep 17 00:00:00 2001 From: Repellent Date: Tue, 3 Sep 2019 21:50:50 +0500 Subject: [PATCH] =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=BF=D1=82=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D0=B8=20ave.cms=20v3.26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- rss/{class.rss.php => class/rss.php} | 0 rss/info.php | 20 ++++++++++++++++++++ rss/lang/ru.txt | 5 +++++ rss/module.php | 21 +++------------------ rss/sql.php | 10 +++++----- 6 files changed, 36 insertions(+), 24 deletions(-) rename rss/{class.rss.php => class/rss.php} (100%) create mode 100644 rss/info.php diff --git a/README.md b/README.md index 7e51b93..f171a5b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## rss -# Модуль RSS v1.2 +# Модуль RSS v1.26.2 ## Данный модуль предзназначен для организации RSS потоков на вашем сайте. @@ -10,4 +10,6 @@ ## Changelog: +03.09.2019 - версия 1.26.2 - адаптация для версии ave.cms v3.26 + 15.01.2013 - версия 1.2 \ No newline at end of file diff --git a/rss/class.rss.php b/rss/class/rss.php similarity index 100% rename from rss/class.rss.php rename to rss/class/rss.php diff --git a/rss/info.php b/rss/info.php new file mode 100644 index 0000000..2679bbe --- /dev/null +++ b/rss/info.php @@ -0,0 +1,20 @@ + 'rss', + 'ModuleVersion' => '1.26.2', + 'ModuleAutor' => 'AVE.cms Team', + 'ModuleCopyright' => '© 2007-' . date('Y') . ' AVE.cms', + 'ModuleStatus' => 1, + 'ModuleIsFunction' => 1, + 'ModuleTemplate' => 0, + 'ModuleAdminEdit' => 1, + 'ModuleFunction' => 'mod_rss', + 'ModuleTag' => '[mod_rss:XXX]', + 'ModuleTagLink' => null, + 'ModuleAveTag' => '#\\\[mod_rss:(\\\d+)]#', + 'ModulePHPTag' => "" + ); +?> \ No newline at end of file diff --git a/rss/lang/ru.txt b/rss/lang/ru.txt index 8ebf623..8048fed 100644 --- a/rss/lang/ru.txt +++ b/rss/lang/ru.txt @@ -1,3 +1,8 @@ +[name] +MODULE_NAME = "RSS потоки" +MODULE_DESCRIPTION = "Данный модуль предзназначен для организации RSS потоков на вашем сайте." + +[module] RSS_ENTER_NAME = "Пожалуйста, укажите название RSS канала" RSS_BUTTON_ADD = "Добавить канал" RSS_BUTTON_SAVE = "Сохранить изменения" diff --git a/rss/module.php b/rss/module.php index aa1bc6e..261302d 100644 --- a/rss/module.php +++ b/rss/module.php @@ -10,23 +10,6 @@ if(!defined('BASE_DIR')) exit; -if (defined('ACP')) -{ - $modul['ModuleName'] = 'RSS потоки'; - $modul['ModuleSysName'] = 'rss'; - $modul['ModuleVersion'] = '1.2'; - $modul['ModuleDescription'] = 'Данный модуль предзназначен для организации RSS потоков на вашем сайте.'; - $modul['ModuleAutor'] = 'AVE.CMS Team'; - $modul['ModuleCopyright'] = '© 2007-2013 AVE.CMS'; - $modul['ModuleIsFunction'] = 1; - $modul['ModuleAdminEdit'] = 1; - $modul['ModuleFunction'] = 'mod_rss'; - $modul['ModuleTag'] = '[mod_rss:XXX]'; - $modul['ModuleTagLink'] = null; - $modul['ModuleAveTag'] = '#\\\[mod_rss:(\\\d+)]#'; - $modul['ModulePHPTag'] = ""; -} - /** * Обработка тега модуля RSS * @@ -51,13 +34,14 @@ if (isset($_REQUEST['module']) && $_REQUEST['module'] == 'rss' if (defined('ACP') && !empty($_REQUEST['moduleaction'])) { - require(BASE_DIR . '/modules/rss/class.rss.php'); + require(BASE_DIR . '/modules/rss/class/rss.php'); switch ($_REQUEST['moduleaction']) { case '1': $tpl_dir = BASE_DIR . '/modules/rss/templates/'; $lang_file = BASE_DIR . '/modules/rss/lang/' . $_SESSION['user_language'] . '.txt'; + $AVE_Template->config_load($lang_file, 'module'); Rss::rssList($tpl_dir, $lang_file); break; @@ -72,6 +56,7 @@ if (defined('ACP') && !empty($_REQUEST['moduleaction'])) case 'edit': $tpl_dir = BASE_DIR . '/modules/rss/templates/'; $lang_file = BASE_DIR . '/modules/rss/lang/' . $_SESSION['user_language'] . '.txt'; + $AVE_Template->config_load($lang_file, 'module'); Rss::rssEdit($tpl_dir, $lang_file); break; diff --git a/rss/sql.php b/rss/sql.php index 53b9786..6516fd6 100644 --- a/rss/sql.php +++ b/rss/sql.php @@ -17,10 +17,10 @@ $module_sql_deinstall = array(); $module_sql_update = array(); //Удаление модуля -$module_sql_deinstall[] = "DROP TABLE IF EXISTS CPPREFIX_modul_rss;"; +$module_sql_deinstall[] = "DROP TABLE IF EXISTS %%PRFX%%_modul_rss;"; //Установка модуля -$module_sql_install[] = "CREATE TABLE CPPREFIX_module_rss ( +$module_sql_install[] = "CREATE TABLE %%PRFX%%_module_rss ( `id` smallint(3) unsigned NOT NULL auto_increment, `rss_site_name` char(255) NOT NULL, `rss_site_description` char(255) NOT NULL, @@ -36,7 +36,7 @@ $module_sql_install[] = "CREATE TABLE CPPREFIX_module_rss ( // Обновление модуля $module_sql_update[] = " UPDATE - `CPPREFIX_module` + `%%PRFX%%_module` SET ModuleAveTag = '" . $modul['ModuleAveTag'] . "', ModulePHPTag = '" . $modul['ModulePHPTag'] . "', @@ -48,8 +48,8 @@ $module_sql_update[] = " $module_sql_update[] = " RENAME TABLE - `CPPREFIX_modul_rss` + `%%PRFX%%_modul_rss` TO - `CPPREFIX_module_rss` + `%%PRFX%%_module_rss` "; ?> \ No newline at end of file