[4.0] Added Save2Copy in Media Manager

administrator/components/com_media/resources/scripts/app/Api.js

@@ -157,7 +157,7 @@ class Api {
                 headers: {'Content-Type': 'application/json'},
                 onSuccess: (response) => {
                     notifications.success('COM_MEDIA_RENAME_SUCCESS');
-                    resolve(this._normalizeItem(JSON.parse(response).data))
+                    resolve(this._normalizeItem(JSON.parse(response).data.file))
                 },
                 onError: (xhr) => {
                     notifications.error('COM_MEDIA_RENAME_ERROR');

administrator/components/com_media/resources/scripts/components/browser/items/image.vue

@@ -124,6 +124,25 @@
             },
             /* Edit an item */
             editItem() {
+							window.parent.document.dispatchEvent(
+									new CustomEvent(
+											'onMediaFileEdit',
+											{
+												"bubbles": true,
+												"cancelable": false,
+												"detail": {
+													path: this.item.path,
+													thumb: this.item.thumb,
+													fileType: this.item.mime_type ? this.item.mime_type : false,
+													extension: this.item.extension ? this.item.extension : false,
+													file: {
+														name: this.item.name ? this.item.name : ''
+													}
+												},
+											}
+									)
+							);
+
                 // TODO should we use relative urls here?
                 const fileBaseUrl = Joomla.getOptions('com_media').editViewUrl + '&path=';
 

administrator/components/com_media/src/Controller/ApiController.php

@@ -13,6 +13,8 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\MediaHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
@@ -22,6 +24,7 @@
 use Joomla\Component\Media\Administrator\Exception\FileExistsException;
 use Joomla\Component\Media\Administrator\Exception\FileNotFoundException;
 use Joomla\Component\Media\Administrator\Exception\InvalidPathException;
+use Joomla\String\StringHelper;
 
 /**
  * Api Media Controller
@@ -252,7 +255,7 @@ public function postFiles()
 	 *          "move"    : "0"
 	 *     }
 	 *
-	 * @return  array  The data to send with the response
+	 * @return  \stdClass  The data to send with the response
 	 *
 	 * @since   4.0.0
 	 * @throws  \Exception
@@ -261,18 +264,31 @@ public function putFiles()
 	{
 		$adapter = $this->getAdapter();
 		$path    = $this->getPath();
+		$model   = $this->getModel();
 
 		$content      = $this->input->json;
 		$name         = basename($path);
 		$mediaContent = base64_decode($content->get('content', '', 'raw'));
 		$newPath      = $content->getString('newPath', null);
 		$move         = $content->get('move', true);
+		$resp = new \stdClass;
 
 		if ($mediaContent != null)
 		{
 			$this->checkContent();
+			$resp->isClose = $content->get('isClose');
+			$resp->isCopy = $content->get('isCopy');
 
-			$this->getModel()->updateFile($adapter, $name, str_replace($name, '', $path), $mediaContent);
+			if ($content->get('isCopy'))
+			{
+				$name = $this->generateNewName($name, $path, $model, $adapter);
+				$path = dirname($path) . '/' . $name;
+				$this->getModel()->createFile($adapter, $name, str_replace($name, '', $path), $mediaContent, false);
+			}
+			else
+			{
+				$this->getModel()->updateFile($adapter, $name, str_replace($name, '', $path), $mediaContent);
+			}
 		}
 
 		if ($newPath != null && $newPath !== $adapter . ':' . $path)
@@ -291,9 +307,43 @@ public function putFiles()
 			$path = $destinationPath;
 		}
 
-		return $this->getModel()->getFile($adapter, $path);
+		$resp->file = $this->getModel()->getFile($adapter, $path);
+
+		return $resp;
 	}
 
+	/**
+	 * Method to change the name of an image
+	 *
+	 * @param   string $name The current name.
+	 * @param   string $path The path.
+	 *
+	 * @param   mixed $model The model
+	 * @param   string $adapter The adapter
+	 * @return  string    Contains the modified name.
+	 *
+	 * @since   4.0
+	 */
+	protected function generateNewName($name, $path, $model, $adapter)
+	{
+		$extension = File::getExt($name);
+
+		try
+		{
+			while ($model->getFile($adapter, $path))
+			{
+				$base = File::stripExt($name);
+				$name = StringHelper::increment($base, 'dash') . '.' . $extension;
+				$path = dirname($path) . '/' . $name;
+			}
+		}
+		catch (FileNotFoundException $e)
+		{
+			return $name;
+		}
+
+		return $name;
+	}
 	/**
 	 * Send the given data as JSON response in the following format:
 	 *

administrator/components/com_media/src/View/File/HtmlView.php

@@ -52,7 +52,7 @@ public function display($tpl = null)
 			throw new \Exception('No content available!');
 		}
 
-		$this->addToolbar();
+		$this->addToolbar($this->file->name);
 
 		return parent::display($tpl);
 	}
@@ -64,12 +64,17 @@ public function display($tpl = null)
 	 *
 	 * @since   4.0.0
 	 */
-	protected function addToolbar()
+	protected function addToolbar($name)
 	{
-		ToolbarHelper::title(Text::_('COM_MEDIA_EDIT'), 'images mediamanager');
-
+		Text::script('JLIB_APPLICATION_SAVE_SUCCESS');
+		Text::script('JLIB_APPLICATION_ERROR_SAVE_FAILED_FILE');
+		ToolbarHelper::title(Text::_('COM_MEDIA_EDIT') . ' - ' . $name, 'images mediamanager');
 		ToolbarHelper::apply('apply');
-		ToolbarHelper::save('save');
+		$toolbarButtons = [['save', 'save'], ['save2copy', 'save2copy']];
+		ToolbarHelper::saveGroup(
+			$toolbarButtons,
+			'btn-success'
+		);
 		ToolbarHelper::custom('reset', 'refresh', '',  'COM_MEDIA_RESET', false);
 
 		ToolbarHelper::cancel('cancel');

administrator/language/en-GB/com_media.ini

@@ -22,7 +22,7 @@ COM_MEDIA_DECREASE_GRID="Decrease grid size"
 COM_MEDIA_DELETE_ERROR="Error deleting the item."
 COM_MEDIA_DELETE_SUCCESS="Item deleted."
 COM_MEDIA_DROP_FILE="Drop file(s) to Upload"
-COM_MEDIA_EDIT="Media Edit"
+COM_MEDIA_EDIT="Media: Edit"
 COM_MEDIA_ERROR="An error occurred."
 COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one <a href=\"%s\">filesystem plugin</a>."
 COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login."

administrator/language/en-GB/lib_joomla.ini

@@ -54,6 +54,7 @@ JLIB_APPLICATION_ERROR_REORDER_FAILED="Reorder failed. Error: %s"
 JLIB_APPLICATION_ERROR_ROUTER_LOAD="Unable to load router: %s"
 JLIB_APPLICATION_ERROR_RUN_TRANSITION="Unable to run transition."
 JLIB_APPLICATION_ERROR_SAVE_FAILED="Save failed with the following error: %s"
+JLIB_APPLICATION_ERROR_SAVE_FAILED_FILE="An error has occurred while saving the file."
 JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED="Save not permitted."
 JLIB_APPLICATION_ERROR_SERVER="Internal server error."
 JLIB_APPLICATION_ERROR_TABLE_NAME_NOT_SUPPORTED="Table %s not supported. File not found."

build/media_source/com_media/js/edit-images.es6.js

@@ -131,6 +131,8 @@ Joomla.MediaManager = Joomla.MediaManager || {};
     const forUpload = {
       name,
       content: Joomla.MediaManager.Edit.current.contents.replace(`data:image/${format};base64,`, ''),
+      isCopy: false,
+      isClose: false,
     };
 
     // eslint-disable-next-line prefer-destructuring
@@ -142,23 +144,20 @@ Joomla.MediaManager = Joomla.MediaManager || {};
 
     forUpload[options.csrfToken] = '1';
 
-    let fileDirectory = uploadPath.split('/');
-    fileDirectory.pop();
-    fileDirectory = fileDirectory.join('/');
-
-    // If we are in root add a backslash
-    if (fileDirectory.endsWith(':')) {
-      fileDirectory = `${fileDirectory}/`;
-    }
-
+    const fileDirectory = Joomla.MediaManager.GetDirectory(uploadPath);
     switch (task) {
       case 'apply':
         Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type);
         Joomla.MediaManager.Edit.Reset(true);
         break;
+      case 'save2copy':
+        forUpload.isCopy = true;
+        Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type);
+        Joomla.MediaManager.Edit.Reset(true);
+        break;
       case 'save':
+        forUpload.isClose = true;
         Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type);
-        window.location = `${pathName}?option=com_media&path=${fileDirectory}`;
         break;
       case 'cancel':
         if (window.self !== window.top) {
@@ -187,6 +186,17 @@ Joomla.MediaManager = Joomla.MediaManager || {};
   // The upload object
   Joomla.UploadFile = {};
 
+  Joomla.MediaManager.GetDirectory = (path) => {
+    let fileDirectory = path.split('/');
+    fileDirectory.pop();
+    fileDirectory = fileDirectory.join('/');
+    // If we are in root add a backslash
+    if (fileDirectory.endsWith(':')) {
+      fileDirectory = `${fileDirectory}/`;
+    }
+    return fileDirectory;
+  };
+
   /**
    * @TODO Extend Joomla.request and drop this code!!!!
    */
@@ -204,24 +214,56 @@ Joomla.MediaManager = Joomla.MediaManager || {};
       } catch (er) {
         resp = null;
       }
-
       if (resp) {
         if (xhr.status === 200) {
           if (resp.success === true) {
             Joomla.MediaManager.Edit.removeProgressBar();
+            if (resp.data.isClose) {
+              window.parent.document.dispatchEvent(new CustomEvent('onMediaFileEdit', {
+                detail: {
+                  file: {
+                    name: '',
+                  },
+                },
+              }));
+              const fileDirectory = Joomla.MediaManager.GetDirectory(resp.data.file.path);
+              const pathName = window.location.pathname.replace(/&view=file.*/g, '');
+              window.location = `${pathName}?option=com_media&path=${fileDirectory}`;
+            }
+            if (resp.data.isCopy) {
+              window.parent.document.dispatchEvent(new CustomEvent('onMediaFileEdit', {
+                detail: {
+                  file: {
+                    name: resp.data.file.name,
+                  },
+                },
+              }));
+              const fileBaseUrl = `${Joomla.getOptions('com_media').editViewUrl}&path=`;
+              window.location.href = fileBaseUrl + resp.data.file.path;
+            }
+            Joomla.renderMessages({
+              message: [Joomla.JText._('JLIB_APPLICATION_SAVE_SUCCESS')],
+            });
           }
 
           if (resp.status === '1') {
             Joomla.renderMessages({ success: [resp.message] }, 'true');
             Joomla.MediaManager.Edit.removeProgressBar();
           }
+        } else {
+          Joomla.renderMessages({
+            error: [Joomla.JText._('JLIB_APPLICATION_ERROR_SAVE_FAILED_FILE')],
+          });
         }
       } else {
         Joomla.MediaManager.Edit.removeProgressBar();
       }
     };
 
     xhr.onerror = () => {
+      Joomla.renderMessages({
+        error: [Joomla.JText._('JLIB_APPLICATION_ERROR_SAVE_FAILED_FILE')],
+      });
       Joomla.MediaManager.Edit.removeProgressBar();
     };
 

build/media_source/system/js/fields/joomla-field-media.w-c.es6.js

@@ -7,6 +7,9 @@
 
   window.document.addEventListener('onMediaFileSelected', (e) => {
     Joomla.selectedFile = e.detail;
+    window.document.dispatchEvent(new CustomEvent('onMediaFileEdit', {
+      detail: e.detail,
+    }));
   });
 
   const execTransform = (resp, editor, fieldClass) => {
@@ -55,6 +58,7 @@
    * @returns {void}
    */
   Joomla.getImage = (data, editor, fieldClass) => new Promise((resolve, reject) => {
+    Joomla.setTitle(null);
     if (!data || (typeof data === 'object' && (!data.path || data.path === ''))) {
       Joomla.selectedFile = {};
       resolve({
@@ -92,6 +96,8 @@
       this.modalClose = this.modalClose.bind(this);
       this.setValue = this.setValue.bind(this);
       this.updatePreview = this.updatePreview.bind(this);
+      this.onMediaFileEdit = this.onMediaFileEdit.bind(this);
+      this.setTitle = this.setTitle.bind(this);
     }
 
     static get observedAttributes() {
@@ -158,6 +164,13 @@
 
     // attributeChangedCallback(attr, oldValue, newValue) {}
 
+    onMediaFileEdit(e) {
+      if (e.detail && e.detail.file && e.detail.file.name) {
+        this.setTitle(e.detail.file.name);
+        Joomla.selectedFile = e.detail;
+      }
+    }
+
     connectedCallback() {
       this.button = this.querySelector(this.buttonSelect);
       this.inputElement = this.querySelector(this.input);
@@ -193,6 +206,14 @@
       }
     }
 
+    setTitle(titleString) {
+      const title = this.querySelector('.modal-title');
+
+      if (title) {
+        title.textContent = `${Joomla.JText._('PLG_IMAGE_BUTTON_IMAGE')} - ${titleString} `;
+      }
+    }
+
     onSelected(event) {
       event.preventDefault();
       event.stopPropagation();
@@ -203,13 +224,13 @@
 
     show() {
       this.modalElement.open();
-
       Joomla.selectedFile = {};
-
+      window.document.addEventListener('onMediaFileEdit', this.onMediaFileEdit);
       this.buttonSaveSelectedElement.addEventListener('click', this.onSelected);
     }
 
     modalClose() {
+      window.document.removeEventListener('onMediaFileEdit', this.onMediaFileEdit);
       Joomla.getImage(Joomla.selectedFile, this.inputElement, this)
         .then(() => {
           Joomla.Modal.getCurrent().close();

language/en-GB/lib_joomla.ini

@@ -54,6 +54,7 @@ JLIB_APPLICATION_ERROR_REORDER_FAILED="Reorder failed. Error: %s"
 JLIB_APPLICATION_ERROR_ROUTER_LOAD="Unable to load router: %s"
 JLIB_APPLICATION_ERROR_RUN_TRANSITION="Unable to run transition."
 JLIB_APPLICATION_ERROR_SAVE_FAILED="Save failed with the following error: %s"
+JLIB_APPLICATION_ERROR_SAVE_FAILED_FILE="An error has occurred while saving the file."
 JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED="Save not permitted."
 JLIB_APPLICATION_ERROR_SERVER="Internal server error."
 JLIB_APPLICATION_ERROR_TABLE_NAME_NOT_SUPPORTED="Table %s not supported. File not found."

plugins/editors-xtd/image/image.php

@@ -63,9 +63,8 @@ public function onDisplay($name, $asset, $author)
 			|| (count($user->getAuthorisedCategories($extension, 'core.edit.own')) > 0 && $author === $user->id))
 		{
 			$app->getDocument()->getWebAssetManager()->useScript('webcomponent.field-media');
-
 			$link = 'index.php?option=com_media&tmpl=component&e_name=' . $name . '&asset=' . $asset . '&author=' . $author;
-
+			Text::script('PLG_IMAGE_BUTTON_IMAGE');
 			$button = new CMSObject;
 			$button->modal   = true;
 			$button->link    = $link;