From bdb07eeb89277d523a4ba6305f64a3bcf6f4e3f3 Mon Sep 17 00:00:00 2001 From: tsymb Date: Fri, 17 May 2019 09:59:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=201.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/quantumtreecatalogs.php | 2 +- .../com_quantummanager/fields/quantumcombine.php | 1 + .../components/com_quantummanager/filesystem/local.php | 2 +- .../com_quantummanager/helpers/quantummanager.php | 6 ++++-- .../language/en-GB/en-GB.com_quantummanager.ini | 6 +++++- .../language/en-GB/en-GB.com_quantummanager.sys.ini | 6 +++++- .../language/ru-RU/ru-RU.com_quantummanager.ini | 6 +++++- .../language/ru-RU/ru-RU.com_quantummanager.sys.ini | 4 ++++ .../components/com_quantummanager/layouts/help.php | 10 ++++++---- quantummanager.xml | 2 +- 10 files changed, 33 insertions(+), 12 deletions(-) diff --git a/administrator/components/com_quantummanager/controllers/quantumtreecatalogs.php b/administrator/components/com_quantummanager/controllers/quantumtreecatalogs.php index a6dd858..b48c6ea 100644 --- a/administrator/components/com_quantummanager/controllers/quantumtreecatalogs.php +++ b/administrator/components/com_quantummanager/controllers/quantumtreecatalogs.php @@ -29,7 +29,7 @@ public function getDirectories() { $app = Factory::getApplication(); $data = $app->input->getArray(); - $path = JPATH_ROOT . DIRECTORY_SEPARATOR . $data['path']; + $path = $data['path']; JLoader::register('QuantummanagerFileSystemLocal', JPATH_ROOT . '/administrator/components/com_quantummanager/filesystem/local.php'); echo QuantummanagerFileSystemLocal::getDirectories($path); diff --git a/administrator/components/com_quantummanager/fields/quantumcombine.php b/administrator/components/com_quantummanager/fields/quantumcombine.php index 15b8061..f8b1629 100644 --- a/administrator/components/com_quantummanager/fields/quantumcombine.php +++ b/administrator/components/com_quantummanager/fields/quantumcombine.php @@ -99,6 +99,7 @@ public function getInput() 'right' => '', 'container-bottom' => '', 'bottom' => '', + 'container-bottom-fixed' => '', ]; foreach ($fields as $field => $options) diff --git a/administrator/components/com_quantummanager/filesystem/local.php b/administrator/components/com_quantummanager/filesystem/local.php index f081b00..493b85e 100644 --- a/administrator/components/com_quantummanager/filesystem/local.php +++ b/administrator/components/com_quantummanager/filesystem/local.php @@ -54,7 +54,7 @@ public static function createDirectory($path, $name) public static function getDirectories($path) { JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php'); - $path = QuantummanagerHelper::preparePath($path); + $path = JPATH_ROOT . DIRECTORY_SEPARATOR . QuantummanagerHelper::preparePath($path); $directories = []; $directories = self::showdir($path, true, true); diff --git a/administrator/components/com_quantummanager/helpers/quantummanager.php b/administrator/components/com_quantummanager/helpers/quantummanager.php index fd4fb8d..a933828 100644 --- a/administrator/components/com_quantummanager/helpers/quantummanager.php +++ b/administrator/components/com_quantummanager/helpers/quantummanager.php @@ -178,7 +178,7 @@ public static function preparePath($path) $pathConfig = $componentParams->get('path', 'images'); $path = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $path); - $path = preg_replace("#" . JPATH_SITE . "\/root(\/)?#", '', $path); + $path = preg_replace("#" . JPATH_ROOT . "\/root(\/)?#", '', $path); $path = preg_replace("#^root(\/)?#", '', $path); $path = str_replace('..' . DIRECTORY_SEPARATOR, '', $path); @@ -197,7 +197,9 @@ public static function preparePath($path) $path = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $path); } - $folders = explode(DIRECTORY_SEPARATOR, $path); + $pathCurrent = str_replace(JPATH_ROOT, '', $path); + $pathCurrent = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $pathCurrent); + $folders = explode(DIRECTORY_SEPARATOR, $pathCurrent); $currentTmp = ''; foreach ($folders as $tmpFolder) diff --git a/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.ini b/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.ini index 60ae94e..9c526c1 100644 --- a/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.ini +++ b/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.ini @@ -69,4 +69,8 @@ COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FLIP_VERTICAL="Flip Vertical" COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_CLEAR="Clear" COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_DISABLE="Block" COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_ENABLE="Unlock" -COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FREE="Free mode" \ No newline at end of file +COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FREE="Free mode" + +COM_QUANTUMMANAGER_HELP_QUESTIONS="Any questions?" +COM_QUANTUMMANAGER_HELP_QUESTIONS_CREATE="Ask" +COM_QUANTUMMANAGER_HELP_QUESTIONS_SHOW="View all" \ No newline at end of file diff --git a/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.sys.ini b/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.sys.ini index 04ae225..6fca9b3 100644 --- a/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.sys.ini +++ b/administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.sys.ini @@ -72,4 +72,8 @@ COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_ENABLE="Unlock" COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FREE="Free mode" COM_QUANTUMMANAGER_WRONG_JOOMLA="You need at least Joomla 3.8.1." -COM_QUANTUMMANAGER_WRONG_PHP="You need PHP version at least 5.6" \ No newline at end of file +COM_QUANTUMMANAGER_WRONG_PHP="You need PHP version at least 5.6" + +COM_QUANTUMMANAGER_HELP_QUESTIONS="Any questions?" +COM_QUANTUMMANAGER_HELP_QUESTIONS_CREATE="Ask" +COM_QUANTUMMANAGER_HELP_QUESTIONS_SHOW="View all" \ No newline at end of file diff --git a/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.ini b/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.ini index 7a4149e..2070deb 100644 --- a/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.ini +++ b/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.ini @@ -69,4 +69,8 @@ COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FLIP_VERTICAL="Отразить по COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_CLEAR="Очистить" COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_DISABLE="Заблокировать" COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_ENABLE="Разблокировать" -COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FREE="Свободный режим" \ No newline at end of file +COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FREE="Свободный режим" + +COM_QUANTUMMANAGER_HELP_QUESTIONS="Есть вопросы?" +COM_QUANTUMMANAGER_HELP_QUESTIONS_CREATE="Спросить" +COM_QUANTUMMANAGER_HELP_QUESTIONS_SHOW="Просмотреть все" \ No newline at end of file diff --git a/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.sys.ini b/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.sys.ini index 5bc39ad..dec75d5 100644 --- a/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.sys.ini +++ b/administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.sys.ini @@ -74,3 +74,7 @@ COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_FREE="Свободный режим" COM_QUANTUMMANAGER_WRONG_JOOMLA="Ваша версия Joomla слишком старая. Quantum Manager будет работать только на Joomla с версии 3.8.1." COM_QUANTUMMANAGER_WRONG_PHP="Нужна версия PHP не ниже 5.6" + +COM_QUANTUMMANAGER_HELP_QUESTIONS="Есть вопросы?" +COM_QUANTUMMANAGER_HELP_QUESTIONS_CREATE="Спросить" +COM_QUANTUMMANAGER_HELP_QUESTIONS_SHOW="Просмотреть все" diff --git a/administrator/components/com_quantummanager/layouts/help.php b/administrator/components/com_quantummanager/layouts/help.php index bd2f9c2..ac5832d 100644 --- a/administrator/components/com_quantummanager/layouts/help.php +++ b/administrator/components/com_quantummanager/layouts/help.php @@ -8,24 +8,26 @@ * @link https://delo-design.ru */ defined('_JEXEC') or die; + +use Joomla\CMS\Language\Text; ?>
- Есть вопросы? +
- Спросить + | - Просмотреть все +
Контакт с автором @tsymbalmitia (telegram) | - quantum@delo-design.ru (email) + quantum@hika.su (email)
diff --git a/quantummanager.xml b/quantummanager.xml index 780ea9a..3b6fe1f 100644 --- a/quantummanager.xml +++ b/quantummanager.xml @@ -7,7 +7,7 @@ https://delo-design.ru Copyright (C) 2019 "Delo Design". All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 1.0 + 1.0.1 COM_QUANTUMMANAGER_XML_DESCRIPTION script.php