Version 1.2: Add support for Joomla 1.5, add German translation, clean up language files

Makefile

 BASE=downloads_for_sale
 PLUGINTYPE=vmcustom
-VERSION=1.1
+VERSION=1.2
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
 
-TRANSLATIONS=$(call wildcard,*.plg_$(PLUGINTYPE)_$(BASE).*ini) 
-INDEXFILES=$(BASE)/index.html
+TRANSLATIONS=$(call wildcard,language/*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) 
+INDEXFILES=$(BASE)/index.html language/index.html $(call wildcard,language/*/index.html)
 TMPLFILES=$(call wildcard,$(BASE)/tmpl/*.php) $(BASE)/index.html $(BASE)/tmpl/index.html
-ASSETS=$(call wildcard,assets/*.png) $(call wildcard,assets/*.css) assets/index.html
+ASSETS=$(call wildcard,$(BASE)/assets/*.png) $(call wildcard,$(BASE)/assets/*.css) $(BASE)/assets/index.html
 ZIPFILE=plg_$(PLUGINTYPE)_$(BASE)_v$(VERSION).zip
 
 

downloads_for_sale.php

@@ -18,6 +18,14 @@ defined('_JEXEC') or 	die( 'Direct Access to ' . basename( __FILE__ ) . ' is not
 if (!class_exists('vmCustomPlugin')) require(JPATH_VM_PLUGINS . DS . 'vmcustomplugin.php');
 if(!class_exists('VmTable'))require(JPATH_VM_ADMINISTRATOR.DS.'helpers'.DS.'vmtable.php');
 
+if (JVM_VERSION === 2) {
+    if (!defined('VMDLSALE_PLUGINPATH')) define('VMDLSALE_PLUGINPATH', JPATH_SITE.DS.'plugins'.DS.'vmcustom'.DS.'downloads_for_sale');
+    if (!defined('VMDLSALE_PLUGINWEBROOT')) define('VMDLSALE_PLUGINWEBROOT', 'plugins/vmcustom/downloads_for_sale');
+} else {
+    if (!defined('VMDLSALE_PLUGINPATH')) define('VMDLSALE_PLUGINPATH', JPATH_SITE.DS.'plugins'.DS.'vmcustom');
+    if (!defined('VMDLSALE_PLUGINWEBROOT')) define('VMDLSALE_PLUGINWEBROOT', 'plugins/vmcustom');
+}
+
 class plgVmCustomDownloads_for_Sale extends vmCustomPlugin {
 	var $status_allowed = array ('S', 'C');
 
@@ -137,6 +145,7 @@ class plgVmCustomDownloads_for_Sale extends vmCustomPlugin {
 
 	function downloadFile($media_id, &$output){
 		if ($media_id) {
+			jimport('joomla.filesystem.file');
 			$media = $this->getDownloadFile($media_id);
 			if (!$media) {
 				JFactory::getApplication()->enqueueMessage(JText::_('VMCUSTOM_DLSALE_ERROR_NO_FILE_SET'), 'error');
@@ -312,16 +321,22 @@ class plgVmCustomDownloads_for_Sale extends vmCustomPlugin {
 			return true;
 		}
 		
-		$link_types = array('none' => 'VMCUSTOM_DLSALE_LINK_NONE', 'compact'=>'VMCUSTOM_DLSALE_LINK_COMPACT', 'long'=>'VMCUSTOM_DLSALE_LINK_LONG');
-		
+		$link_types = array(
+			array('link-id'=>'none', 'link-name'=>'VMCUSTOM_DLSALE_LINK_NONE'), 
+			array('link-id'=>'compact', 'link-name'=>'VMCUSTOM_DLSALE_LINK_COMPACT'), 
+			array('link-id'=>'long', 'link-name'=>'VMCUSTOM_DLSALE_LINK_LONG'),
+		);
+		$download_types = array (
+			array('id'=>'free_download', 'name'=>'VMCUSTOM_DLSALE_TYPE_FREE'),
+			array('id'=>'registered_download', 'name'=>'VMCUSTOM_DLSALE_TYPE_REGISTERED'),
+			array('id'=>'paid_download', 'name'=>'VMCUSTOM_DLSALE_TYPE_PAID'),
+		);
 		$html .= VmHTML::row('select', 'VMCUSTOM_DLSALE_DOWNLOAD_FILE', 'custom_param['.$row.'][media_id]', $download_files, $field->media_id,'','virtuemart_media_id', 'file_title', false);
 		if ($field->is_cart_attribute) {
-			$html .= VmHTML::row ('select','VMCUSTOM_DLSALE_INVOICE_LINK', 'custom_param['.$row.'][invoice_link_type]',$link_types,$field->invoice_link_type, '', '', '', false);
+			$html .= VmHTML::row ('select','VMCUSTOM_DLSALE_INVOICE_LINK', 'custom_param['.$row.'][invoice_link_type]',$link_types,$field->invoice_link_type, '', 'link-id', 'link-name', false);
 		}
-		$html .= VmHTML::row ('select','VMCUSTOM_DLSALE_PRODUCT_LINK', 'custom_param['.$row.'][product_link_type]',$link_types,$field->product_link_type, '', '', '', false);
-		$html .= VmHTML::row('select', 'VMCUSTOM_DLSALE_TYPE', 'custom_param['.$row.'][download_type]', 
-			array('free_download'=>'VMCUSTOM_DLSALE_TYPE_FREE', 'registered_download'=>'VMCUSTOM_DLSALE_TYPE_REGISTERED', 'paid_download'=>'VMCUSTOM_DLSALE_TYPE_PAID'), 
-			$field->download_type,'','', '', false);
+		$html .= VmHTML::row ('select','VMCUSTOM_DLSALE_PRODUCT_LINK', 'custom_param['.$row.'][product_link_type]',$link_types,$field->product_link_type, '', 'link-id', 'link-name', false);
+		$html .= VmHTML::row('select', 'VMCUSTOM_DLSALE_TYPE', 'custom_param['.$row.'][download_type]', $download_types,$field->download_type,'','id', 'name', false);
 		$html .= '</table></fieldset>';
 
 		$retValue .= $html;
@@ -489,7 +504,6 @@ class plgVmCustomDownloads_for_Sale extends vmCustomPlugin {
 	function plgVmConfirmedOrder($cart, $order) {
 		// TODO: Add record to the database to store # of downloads etc.
 		// TODO
-JFactory::getApplication()->enqueueMessage("plgVmConfirmedOrder", 'error');
 		
 	}
 

downloads_for_sale.xml

@@ -6,20 +6,24 @@
     <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.1.0</version>
+    <version>1.2.0</version>
     <description>VMCUSTOM_DLSALE_DESC</description>
     <files>
         <filename plugin="downloads_for_sale">downloads_for_sale.php</filename>
         <filename>downloads_for_sale.script.php</filename>
         <folder>downloads_for_sale</folder>
-        <folder>assets</folder>
+        <folder>language</folder>
         <filename>index.html</filename>
     </files>
-    <languages>
-        <language tag="en-GB">en-GB.plg_vmcustom_downloads_for_sale.ini</language>
+    <languages folder="language">
+        <language tag="en-GB">en-GB/en-GB.plg_vmcustom_downloads_for_sale.ini</language>
+        <language tag="en-GB">en-GB/en-GB.plg_vmcustom_downloads_for_sale.sys.ini</language>
+        <language tag="de-DE">de-DE/de-DE.plg_vmcustom_downloads_for_sale.ini</language>
+        <language tag="de-DE">de-DE/de-DE.plg_vmcustom_downloads_for_sale.sys.ini</language>
     </languages>
     <scriptfile>downloads_for_sale.script.php</scriptfile>
     <params addpath="/administrator/components/com_virtuemart/elements">
+        <param type="vmjpluginwarning" />
         <param name="invoice_link_type" type="list" default="link" label="VMCUSTOM_DLSALE_INVOICE_LINK" description="VMCUSTOM_DLSALE_INVOICE_LINK_DESC" >
             <option value="none">VMCUSTOM_DLSALE_LINK_NONE</option>
             <option value="compact">VMCUSTOM_DLSALE_LINK_COMPACT</option>

downloads_for_sale/tmpl/downloads.php

@@ -11,9 +11,9 @@
  
 defined('_JEXEC') or die();
 
-if(JFile::exists(JPATH_SITE.DS.'plugins'.DS.'vmcustom'.DS.'downloads_for_sale'.DS.'assets'.DS.'downloads_for_sale.css')) {
+if(JFile::exists(VMDLSALE_PLUGINPATH.DS.'downloads_for_sale'.DS.'assets'.DS.'downloads_for_sale.css')) {
 	$doc =& JFactory::getDocument();
-	$doc->addStyleSheet(JURI::root().'plugins/vmcustom/downloads_for_sale/assets/downloads_for_sale.css');  
+	$doc->addStyleSheet(JURI::root().VMDLSALE_PLUGINWEBROOT.'/downloads_for_sale/assets/downloads_for_sale.css');  
 }
 ?>
 

downloads_for_sale/tmpl/order_compact.php

@@ -11,4 +11,4 @@
 defined('_JEXEC') or die();
 
 ?>
-<a href="<?php echo $viewData[0]; ?>"><img style="vertical-align:middle; display: inline;" src="<?php echo JURI::root().'plugins/vmcustom/downloads_for_sale/assets/download_small.png'; ?>" alt=""/> <?php echo $viewData[2]->file_title; ?></a>
\ No newline at end of file
+<a href="<?php echo $viewData[0]; ?>"><img style="vertical-align:middle; display: inline;" src="<?php echo JURI::root().VMDLSALE_PLUGINWEBROOT.'/downloads_for_sale/assets/download_small.png'; ?>" alt=""/> <?php echo $viewData[2]->file_title; ?></a>
\ No newline at end of file

downloads_for_sale/tmpl/order_long.php

@@ -10,9 +10,9 @@
  **/
  
 defined('_JEXEC') or die();
-if(JFile::exists(JPATH_SITE.DS.'plugins'.DS.'vmcustom'.DS.'downloads_for_sale'.DS.'assets'.DS.'downloads_for_sale.css')) {
+if(JFile::exists(VMDLSALE_PLUGINPATH.DS.'downloads_for_sale'.DS.'assets'.DS.'downloads_for_sale.css')) {
 	$doc =& JFactory::getDocument();
-	$doc->addStyleSheet(JURI::root().'plugins/vmcustom/downloads_for_sale/assets/downloads_for_sale.css');  
+	$doc->addStyleSheet(JURI::root().VMDLSALE_PLUGINWEBROOT.'/downloads_for_sale/assets/downloads_for_sale.css');  
 }
 ?>
 <div class="downloads-for-sale">
@@ -20,7 +20,7 @@ if(JFile::exists(JPATH_SITE.DS.'plugins'.DS.'vmcustom'.DS.'downloads_for_sale'.D
 <table border=0>
 <tr>
   <td width="15%">
-    <a href="<?php echo $viewData[0]; ?>"><img style="vertical-align:middle; display: inline; float:left;" src="<?php echo JURI::root().'plugins/vmcustom/downloads_for_sale/assets/download_medium.png'; ?>" alt="<?php echo $viewData[2]->file_title; ?>"></a>
+    <a href="<?php echo $viewData[0]; ?>"><img style="vertical-align:middle; display: inline; float:left;" src="<?php echo JURI::root().VMDLSALE_PLUGINWEBROOT.'/downloads_for_sale/assets/download_medium.png'; ?>" alt="<?php echo $viewData[2]->file_title; ?>"></a>
   </td>
   <td width="85%"><a href="<?php echo $viewData[0]; ?>"><span class="file_title"><?php echo $viewData[2]->file_title; ?></span></a><br/>
     <span class="file_info">(<?php echo basename($viewData[2]->file_url); ?>)<br/>

downloads_for_sale/tmpl/product_compact.php

@@ -11,4 +11,4 @@
  
 defined('_JEXEC') or die();
 ?>
-<p><img style="vertical-align:middle; display: inline;" src="<?php echo JURI::root().'plugins/vmcustom/downloads_for_sale/assets/download_small.png'; ?>" alt=""/> <a href="<?php echo $viewData[0]; ?>"><?php echo $viewData[2]->file_title; ?></a></p>
+<p><img style="vertical-align:middle; display: inline;" src="<?php echo JURI::root().VMDLSALE_PLUGINWEBROOT.'/downloads_for_sale/assets/download_small.png'; ?>" alt=""/> <a href="<?php echo $viewData[0]; ?>"><?php echo $viewData[2]->file_title; ?></a></p>

downloads_for_sale/tmpl/product_long.php

@@ -11,9 +11,9 @@
  
 defined('_JEXEC') or die();
 
-if(JFile::exists(JPATH_SITE.DS.'plugins'.DS.'vmcustom'.DS.'downloads_for_sale'.DS.'assets'.DS.'downloads_for_sale.css')) {
+if(JFile::exists(VMDLSALE_PLUGINPATH.DS.'downloads_for_sale'.DS.'assets'.DS.'downloads_for_sale.css')) {
 	$doc =& JFactory::getDocument();
-	$doc->addStyleSheet(JURI::root().'plugins/vmcustom/downloads_for_sale/assets/downloads_for_sale.css');  
+	$doc->addStyleSheet(JURI::root().VMDLSALE_PLUGINWEBROOT.'/downloads_for_sale/assets/downloads_for_sale.css');  
 }
 ?>
 <div class="downloads-for-sale">
@@ -21,7 +21,7 @@ if(JFile::exists(JPATH_SITE.DS.'plugins'.DS.'vmcustom'.DS.'downloads_for_sale'.D
 <table border=0>
 <tr>
   <td>
-    <a href="<?php echo $viewData[0]; ?>"><img style="vertical-align:middle; display: inline; float:left;" src="<?php echo JURI::root().'plugins/vmcustom/downloads_for_sale/assets/download_medium.png'; ?>" alt="<?php echo $viewData[2]->file_title; ?>"></a>
+    <a href="<?php echo $viewData[0]; ?>"><img style="vertical-align:middle; display: inline; float:left;" src="<?php echo JURI::root().VMDLSALE_PLUGINWEBROOT.'/downloads_for_sale/assets/download_medium.png'; ?>" alt="<?php echo $viewData[2]->file_title; ?>"></a>
   </td>
   <td>
     <a href="<?php echo $viewData[0]; ?>"><span class="file_title"><?php echo $viewData[2]->file_title; ?></span></a><br/>

language/de-DE/de-DE.plg_vmcustom_downloads_for_sale.ini

+; Virtuemart! Project
+; Copyright (C)  2011 Virtuemart Team. All rights reserved.
+; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8 - No BOM
+
+VMCUSTOM_DLSALE="VM Downloads zu verkaufen"
+VMCUSTOM_DLSALE_DESC="VirtueMart Erweiterung, um downloadbare Dateien an Produkte anzuhängen (z.B. Hardwaretreiber oder Benutzerhandbücher) oder kostenlose oder bezahlte Downloads anzubieten."
+
+VMCUSTOM_DLSALE_INVOICE_LINK="Verknüpfungsstil in Rechnungen"
+VMCUSTOM_DLSALE_INVOICE_LINK_DESC="Stil des Download-Links in den Rechnungen, Bestätigungsmails und der Bestellungsansicht."
+VMCUSTOM_DLSALE_PRODUCT_LINK="Verknüpfungsstil auf Produktseiten"
+VMCUSTOM_DLSALE_PRODUCT_LINK_DESC="Stil des Download-Links auf den Produktseiten, der für authorisierte Benutzter angezeigt wird."
+
+VMCUSTOM_DLSALE_LINK_NONE="Keinen Downloadlink anzeigen"
+VMCUSTOM_DLSALE_LINK_COMPACT="Kompakter Downloadlink"
+VMCUSTOM_DLSALE_LINK_LONG="Ausführlicher Downloadlink mit Dateiinformationen"
+
+VMCUSTOM_DLSALE_TYPE="Typ des Downloads"
+VMCUSTOM_DLSALE_TYPE_DESC="Wählen Sie die Standardeinstellung für den Downloadtyp aus"
+VMCUSTOM_DLSALE_TYPE_FREE="Kostenloser Download"
+VMCUSTOM_DLSALE_TYPE_REGISTERED="Download nur nach Registrierung"
+VMCUSTOM_DLSALE_TYPE_PAID="Bezahlter Download"
+
+VMCUSTOM_DLSALE_NO_FILES="Keine Mediendatein für den Download oder Verkauf gefunden."
+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_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."
+VMCUSTOM_DLSALE_ERROR_NOT_AUTHORIZED_UNKNOWN="Nicht zum Download authorisiert."
+
+VMCUSTOM_DLSALE_DLPAGE_TITLE="Downloads zu verkaufen"
+VMCUSTOM_DLSALE_DLPAGE_BUTTON_VIEW="Downloads anzeigen"
+VMCUSTOM_DLSALE_DLPAGE_NO_DOWNLOADS="Keine Downloads verfügbar"
+VMCUSTOM_DLSALE_DLPAGE_ORDER_NO_DOWNLOADS="Keine Downloads verfügbar für Bestellung %s"
+VMCUSTOM_DLSALE_DLPAGE_DOWNLOADS="Verfügbare Downloads"
+VMCUSTOM_DLSALE_DLPAGE_ORDERPRODUCT="Auftragssnummer %s: %s (%s)"
+
+VMCUSTOM_DLSALE_FILENAME="Dateiname"
+VMCUSTOM_DLSALE_MIMETYPE="MIME-Typ"
+VMCUSTOM_DLSALE_FILESIZE="Dateigröße"
+VMCUSTOM_DLSALE_FILESIZE_BYTES="Bytes"
+

language/de-DE/de-DE.plg_vmcustom_downloads_for_sale.sys.ini

+; Virtuemart! Project
+; Copyright (C)  2011 Virtuemart Team. All rights reserved.
+; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8 - No BOM
+
+VMCUSTOM_DLSALE="VM Downloads zu verkaufen"
+VMCUSTOM_DLSALE_DESC="VirtueMart Erweiterung, um downloadbare Dateien an Produkte anzuhängen (z.B. Hardwaretreiber oder Benutzerhandbücher) oder kostenlose oder bezahlte Downloads anzubieten."