Исправления к 1.3

administrator/components/com_quantummanager/config.xml

@@ -228,12 +228,12 @@
 
 		<field name="overlay"
 			   type="radio"
-			   label="Накладывать водяной знак"
+			   label="COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_LABEL"
 			   required="true"
 			   default="0"
 			   class="btn-group">
-			<option value="1">Автоматически</option>
-			<option value="2">Кнопкой</option>
+			<option value="1">COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_AUTO_LABEL</option>
+			<option value="2">COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_BUTTON_LABEL</option>
 			<option value="0">JNO</option>
 		</field>
 

administrator/components/com_quantummanager/filesystem/local.php

@@ -1091,7 +1091,26 @@ public static function getImageForCrop($path, $scope, $file)
 	public static function setWatermark($path, $scope, $list)
 	{
 		JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
-		$path = QuantummanagerHelper::preparePath($path, false, $scope);
+		JLoader::register('QuantummanagerHelperImage', JPATH_ROOT . '/administrator/components/com_quantummanager/helpers/image.php');
+
+		$path = QuantummanagerHelper::preparePath( $path, false, $scope);
+		$image = new QuantummanagerHelperImage;
+
+		foreach ($list as $file)
+		{
+			$pathFile = JPATH_ROOT . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . $file;
+
+			$info = pathinfo($pathFile);
+
+			if(isset($info['extension']) && (!in_array(mb_strtolower($info['extension']), ['jpg', 'jpeg', 'png', 'webp'])))
+			{
+				continue;
+			}
+
+			$image->resizeWatermark($pathFile);
+			$image->reloadCache($pathFile);
+		}
+
 	}
 
 

administrator/components/com_quantummanager/helpers/image.php

@@ -21,6 +21,11 @@ class QuantummanagerHelperImage
 
 	public $paramsComponent;
 
+	public function __construct()
+	{
+		$this->paramsComponent = ComponentHelper::getParams('com_quantummanager');
+	}
+
 	/**
 	 * @param $file
 	 * @param array $options
@@ -46,8 +51,6 @@ public function afterUpload($file, $options = [])
 			$defaultOptions[$key] = $value;
 		}
 
-		$this->paramsComponent = ComponentHelper::getParams('com_quantummanager');
-
 		if($this->paramsComponent->get('original', 0) && (int)$defaultOptions['original'])
 		{
 			$this->originalSave($file);
@@ -58,7 +61,7 @@ public function afterUpload($file, $options = [])
 			$this->resizeFit($file);
 		}
 
-		if($this->paramsComponent->get('overlay', 0) && (int)$defaultOptions['overlay'])
+		if((int)$this->paramsComponent->get('overlay', 0) === 1 && (int)$defaultOptions['overlay'])
 		{
 			$this->resizeWatermark($file);
 		}
@@ -128,9 +131,11 @@ public function resizeWatermark($file)
 				$watermark = $manager->make($logo);
 				$image->insert($watermark, $position);
 
+				$image->save($file);
+
 			}
 
-			$image->save($file);
+
 		}
 		catch (Exception $e) {
 			echo $e->getMessage();
@@ -202,7 +207,7 @@ public function reloadCache($file)
 	{
 		try
 		{
-			$cacheSource =  JPATH_ROOT . DIRECTORY_SEPARATOR . 'images/com_quantummanager/cache';
+			$cacheSource =  JPATH_ROOT . DIRECTORY_SEPARATOR . 'cache/com_quantummanager';
 			$cache = $cacheSource . DIRECTORY_SEPARATOR . str_replace(JPATH_SITE . DIRECTORY_SEPARATOR,'', $file);
 			if(file_exists($cache))
 			{

administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.ini

@@ -46,6 +46,8 @@ COM_QUANTUMMANAGER_CONFIG_IMAGE_RESIZE_DESC="If the param enabled, the images wi
 COM_QUANTUMMANAGER_CONFIG_IMAGE_RESIZE_MAXWIDTH_LABEL="Maximum width <br /> in pixels"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_RESIZE_MAXHEIGHT_LABEL="Maximum height <br /> in pixels"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_LABEL="Add watermark"
+COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_AUTO_LABEL="Auto"
+COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_BUTTON_LABEL="Button"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_FILE_LABEL="Watermark image"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_PERCENT_LABEL="Watermark image resizing in percents"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_PERCENT_VALUE_LABEL="How many percents from the original image the watermark should take?"

administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.ini

@@ -45,6 +45,8 @@ COM_QUANTUMMANAGER_CONFIG_IMAGE_RESIZE_DESC="При включеном пара
 COM_QUANTUMMANAGER_CONFIG_IMAGE_RESIZE_MAXWIDTH_LABEL="Максимальная ширина <br /> в пикселях"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_RESIZE_MAXHEIGHT_LABEL="Максимальная высота <br /> в пикселях"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_LABEL="Накладывать водяной знак"
+COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_AUTO_LABEL="Автоматически"
+COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_BUTTON_LABEL="Кнопой"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_FILE_LABEL="Файл водяного знака"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_PERCENT_LABEL="Ресайзинг водяного знака в процентах"
 COM_QUANTUMMANAGER_CONFIG_IMAGE_OVERLAY_PERCENT_VALUE_LABEL="Сколько процентов от исходного изображения занимать"

administrator/components/com_quantummanager/views/quantummanager/tmpl/content.php

@@ -26,8 +26,7 @@
 }
 
 HTMLHelper::_('stylesheet', 'com_quantummanager/modal.css', [
-	//'version' => filemtime(__FILE__),
-	'version' => rand(111111, 999999),
+	'version' => filemtime(__FILE__),
 	'relative' => true
 ]);
 

media/com_quantummanager/js/modalcontent.js

@@ -151,8 +151,9 @@ document.addEventListener('DOMContentLoaded', function () {
         fm.Quantumtoolbar.buttonsList['insertFileEditor'].classList.add('btn-hide');
 
         let form = fm.Quantumviewfiles.element.querySelector('.modal-form-insert');
+
         if(form !== null) {
-            form.classList.add('active');
+            form.classList.remove('active');
         }
 
     });
@@ -162,7 +163,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
         let form = fm.Quantumviewfiles.element.querySelector('.modal-form-insert');
         if(form !== null) {
-            form.classList.add('active');
+            form.classList.remove('active');
         }
 
     });

media/com_quantummanager/js/quantumcropperjs.js

@@ -435,6 +435,10 @@ window.Quantumcropperjs = function(Filemanager, QuantumCropperjsElement, options
         fm.Quantumtoolbar.buttonsList['cropperjsEdit'].classList.remove('btn-hide');
     });
 
+    Filemanager.events.add(this, 'reloadPaths', function (fm, el, target) {
+        fm.Quantumtoolbar.buttonsList['cropperjsEdit'].classList.add('btn-hide');
+    });
+
     Filemanager.events.add(this, 'updatePath', function (fm, el, target) {
         fm.Quantumtoolbar.buttonsList['cropperjsEdit'].classList.add('btn-hide');
     });