diff --git a/Makefile b/Makefile index 5f96a18716368a1ba76c56c4b84174c6ad2c8784..c7cc0e50cc248a0a67d4f0e1bc3f6971f86a8688 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BASE=downloads_for_sale PLUGINTYPE=vmcustom -VERSION=1.2 +VERSION=1.3 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html diff --git a/downloads_for_sale.php b/downloads_for_sale.php index 322553cd0bcf38547bc152c3bd5698166a07a773..592f526c1592bc0c89c0e2f0bfe5dd161aca9acc 100644 --- a/downloads_for_sale.php +++ b/downloads_for_sale.php @@ -148,7 +148,7 @@ class plgVmCustomDownloads_for_Sale extends vmCustomPlugin { jimport('joomla.filesystem.file'); $media = $this->getDownloadFile($media_id); if (!$media) { - JFactory::getApplication()->enqueueMessage(JText::_('VMCUSTOM_DLSALE_ERROR_NO_FILE_SET'), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('VMCUSTOM_DLSALE_ERROR_MEDIA_NOT_CONFIGURED', $media_id), 'error'); return false; } header("Content-Type: " . $media->file_mimetype); @@ -156,7 +156,7 @@ class plgVmCustomDownloads_for_Sale extends vmCustomPlugin { if (!@readfile($media->file_url)) { header_remove("Content-Type"); header_remove("Content-Disposition"); - JFactory::getApplication()->enqueueMessage(JText::_('VMCUSTOM_DLSALE_ERROR_NO_FILE_SET'), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('VMCUSTOM_DLSALE_ERROR_NO_FILE_SET', $media_id, $media->file_url), 'error'); return false; } JExit(); diff --git a/downloads_for_sale.xml b/downloads_for_sale.xml index 74c8793ddb4a1d9510c8da53052a4b4661fc1038..872fd7b7d61fc5a7898c64729b09c65be9e2355b 100644 --- a/downloads_for_sale.xml +++ b/downloads_for_sale.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.kainhofer.com/</authorUrl> <copyright>Copyright (C) 2013 Reinhold Kainhofer. All rights reserved.</copyright> <license>http://www.gnu.org/licenses/gpl.html GNU/GPL v3+</license> - <version>1.2.0</version> + <version>1.3.0</version> <description>VMCUSTOM_DLSALE_DESC</description> <files> <filename plugin="downloads_for_sale">downloads_for_sale.php</filename> diff --git a/language/de-DE/de-DE.plg_vmcustom_downloads_for_sale.ini b/language/de-DE/de-DE.plg_vmcustom_downloads_for_sale.ini index 2aa1f75c9550e38662f53458b4bd05c287f9e2ad..b68221f326f8001738d723089716c81c8f21685e 100644 --- a/language/de-DE/de-DE.plg_vmcustom_downloads_for_sale.ini +++ b/language/de-DE/de-DE.plg_vmcustom_downloads_for_sale.ini @@ -26,7 +26,8 @@ VMCUSTOM_DLSALE_DOWNLOAD_FILE="Datei zum Download" VMCUSTOM_DLSALE_ERROR_NOT_AUTHORIZED="Nicht zum Download authorisiert. Bitte loggen Sie sich als entsprechender Benutzer ein." VMCUSTOM_DLSALE_ERROR_CUSTOMFIELDID="Benutzerfeld-ID fehlt in der URL." VMCUSTOM_DLSALE_ERROR_LOAD_FAILURE="Konnte Benutzerfeld-Daten nicht laden." -VMCUSTOM_DLSALE_ERROR_NO_FILE_SET="Mediendatei ist nicht verfügbar." +VMCUSTOM_DLSALE_ERROR_MEDIA_NOT_CONFIGURED="Mediendatei nicht konfiguriert (ID=%s)." +VMCUSTOM_DLSALE_ERROR_NO_FILE_SET="Mediendatei ist nicht verfügbar (ID=%s)." VMCUSTOM_DLSALE_ERROR_ORDER_NOT_FOUND="Konnte die Bestellungsinformationen nicht in der Datenbank finden." VMCUSTOM_DLSALE_ERROR_WRONG_PASSWD="Ungültige Bestellungsnummer und/oder Passwort." VMCUSTOM_DLSALE_ERROR_STATUS_NOT_AUTHORIZED="Bestellungsstatus erlaubt keinen Download." diff --git a/language/en-GB/en-GB.plg_vmcustom_downloads_for_sale.ini b/language/en-GB/en-GB.plg_vmcustom_downloads_for_sale.ini index f713c6354753a88422188c36af37857396fd4d6d..00db471531b749d3de65bc12855dd224ec55d00a 100644 --- a/language/en-GB/en-GB.plg_vmcustom_downloads_for_sale.ini +++ b/language/en-GB/en-GB.plg_vmcustom_downloads_for_sale.ini @@ -26,7 +26,8 @@ VMCUSTOM_DLSALE_DOWNLOAD_FILE="Download file" VMCUSTOM_DLSALE_ERROR_NOT_AUTHORIZED="Not authorized to download. Please log in." VMCUSTOM_DLSALE_ERROR_CUSTOMFIELDID="Custom field ID missing in the URL." VMCUSTOM_DLSALE_ERROR_LOAD_FAILURE="Unable to load custom field data." -VMCUSTOM_DLSALE_ERROR_NO_FILE_SET="Media file is not available." +VMCUSTOM_DLSALE_ERROR_MEDIA_NOT_CONFIGURED="Media file not configured (ID=%s)." +VMCUSTOM_DLSALE_ERROR_NO_FILE_SET="Media file is not available (ID=%s, path=%s)." VMCUSTOM_DLSALE_ERROR_ORDER_NOT_FOUND="Unable to find order data in database." VMCUSTOM_DLSALE_ERROR_WRONG_PASSWD="Invalid combination of order number and password." VMCUSTOM_DLSALE_ERROR_STATUS_NOT_AUTHORIZED="Order status does not allow download."