Action logs fix for media manager upload urls (#31836)

Co-authored-by: Richard Fath <[email protected]>
Co-authored-by: Nicola Galgano <[email protected]>

Author: 3 people

administrator/components/com_actionlogs/helpers/actionlogs.php

@@ -246,12 +246,13 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 	 * @param   string   $contentType
 	 * @param   integer  $id
 	 * @param   string   $urlVar
+	 * @param   JObject  $object
 	 *
 	 * @return  string  Link to the content item
 	 *
 	 * @since   3.9.0
 	 */
-	public static function getContentTypeLink($component, $contentType, $id, $urlVar = 'id')
+	public static function getContentTypeLink($component, $contentType, $id, $urlVar = 'id', $object = null)
 	{
 		// Try to find the component helper.
 		$eName = str_replace('com_', '', $component);
@@ -266,7 +267,7 @@ public static function getContentTypeLink($component, $contentType, $id, $urlVar
 
 			if (class_exists($cName) && is_callable(array($cName, 'getContentTypeLink')))
 			{
-				return $cName::getContentTypeLink($contentType, $id);
+				return $cName::getContentTypeLink($contentType, $id, $object);
 			}
 		}
 

administrator/components/com_media/helpers/media.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Object\CMSObject;
+
 /**
  * Media helper class.
  *
@@ -197,4 +199,40 @@ public static function countFiles($dir)
 
 		return $mediaHelper->countFiles($dir);
 	}
+
+	/**
+	 * Generates the URL to the object in the action logs component
+	 *
+	 * @param   string     $contentType  The content type
+	 * @param   integer    $id           The integer id
+	 * @param   CMSObject  $mediaObject  The media object being uploaded
+	 *
+	 * @return  string  The link for the action log
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function getContentTypeLink($contentType, $id, CMSObject $mediaObject)
+	{
+		if ($contentType === 'com_media.file')
+		{
+			return '';
+		}
+
+		$link         = 'index.php?option=com_media&view=media';
+		$uploadedPath = substr($mediaObject->get('filepath'), strlen(COM_MEDIA_BASE) + 1);
+
+		// Now remove the filename
+		$uploadedBasePath = substr_replace(
+			$uploadedPath,
+			'',
+			(strlen(DIRECTORY_SEPARATOR . $mediaObject->get('name')) * -1)
+		);
+
+		if (!empty($uploadedBasePath))
+		{
+			$link = $link . '&folder=' . $uploadedBasePath;
+		}
+
+		return $link;
+	}
 }

plugins/actionlog/joomla/joomla.php

@@ -119,7 +119,7 @@ public function onContentAfterSave($context, $article, $isNew)
 			'type'     => $params->text_prefix . '_TYPE_' . $params->type_title,
 			'id'       => $id,
 			'title'    => $article->get($params->title_holder),
-			'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id, $params->id_holder)
+			'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id, $params->id_holder, $article),
 		);
 
 		$this->addLog(array($message), $messageLanguageKey, $context);
@@ -268,7 +268,7 @@ public function onContentChangeState($context, $pks, $value)
 				'type'        => $params->text_prefix . '_TYPE_' . $params->type_title,
 				'id'          => $pk,
 				'title'       => $items[$pk]->{$params->title_holder},
-				'itemlink'    => ActionlogsHelper::getContentTypeLink($option, $contentType, $pk, $params->id_holder)
+				'itemlink'    => ActionlogsHelper::getContentTypeLink($option, $contentType, $pk, $params->id_holder, null)
 			);
 
 			$messages[] = $message;
@@ -528,7 +528,7 @@ public function onExtensionAfterSave($context, $table, $isNew)
 			'id'             => $table->get($params->id_holder),
 			'title'          => $table->get($params->title_holder),
 			'extension_name' => $table->get($params->title_holder),
-			'itemlink'       => ActionlogsHelper::getContentTypeLink($option, $contentType, $table->get($params->id_holder), $params->id_holder)
+			'itemlink'       => ActionlogsHelper::getContentTypeLink($option, $contentType, $table->get($params->id_holder), $params->id_holder, $article)
 		);
 
 		$this->addLog(array($message), $messageLanguageKey, $context);