diff --git a/fields/vmupdatecredentialscheck.php b/fields/vmupdatecredentialscheck.php
index b6b393d379505d3e2ddfaf772d7856707431d45f..d08397b1a162d02b78ba2551a79aa2e43957a3e4 100644
--- a/fields/vmupdatecredentialscheck.php
+++ b/fields/vmupdatecredentialscheck.php
@@ -124,6 +124,10 @@ jQuery(document).ready (function () {
return "
div.credentials_checked {
padding: 10px 5px;
+ float: left;
+ clear: left;
+ display: block;
+ width: 100%;
}
div.credentials_checked_0 {
background-color: #FFD0D0;
@@ -137,6 +141,11 @@ a#credentials_check {
";
}
protected function getInput() {
+ // Tell the user that automatic updates are not available in Joomla 2.5:
+ if (version_compare(JVERSION, '3.0', 'lt')) {
+ JFactory::getApplication()->enqueueMessage(JText::_('OPENTOOLS_COMMERCIAL_UPDATES_J25'), 'warning');
+ }
+
$this->loadjQuery();
$doc = JFactory::getDocument();
diff --git a/language/de-DE/de-DE.plg_vmshopper_ordernumber.ini b/language/de-DE/de-DE.plg_vmshopper_ordernumber.ini
index 97cae2dc59dedac2312137d1240162d48566310c..b40e8c4dbe22416a937b8f32040b972c27329451 100644
--- a/language/de-DE/de-DE.plg_vmshopper_ordernumber.ini
+++ b/language/de-DE/de-DE.plg_vmshopper_ordernumber.ini
@@ -91,3 +91,4 @@ OPENTOOLS_CHECK_CREDENTIALS="Zugangsdaten überprüfen und speichern"
OPENTOOLS_CHECK_CREDENTIALS_ERROR="Konnte Zugangsdaten nicht überprüfen. Bitte stellen Sie sicher, dass die Erweiterung in Joomla freigegeben ist!"
OPENTOOLS_XMLMANIFEST_ERROR="Konnte die XML-Manifest-Datei der Erweiterung nicht laden (%s)"
OPENTOOLS_UPDATESCRIPT_ERROR="Konnte die Aktualisierungsinformationen nicht laden (%s)"
+OPENTOOLS_COMMERCIAL_UPDATES_J25="Automatische Aktualisierungen von kommerziellen Erweiterungen sind in Joomla 2.5 leider nicht möglich (erste ab Joomla 3.x). Bitte informieren Sie sich auf der Homepage des Entwicklers über mögliche Aktualisierungen und installieren Sie diese manuell."
diff --git a/language/en-GB/en-GB.plg_vmshopper_ordernumber.ini b/language/en-GB/en-GB.plg_vmshopper_ordernumber.ini
index b22875c59212d7f3fa270bb86d6e87bbb786199f..50611936ddc75423b270926807239efe7741dd68 100644
--- a/language/en-GB/en-GB.plg_vmshopper_ordernumber.ini
+++ b/language/en-GB/en-GB.plg_vmshopper_ordernumber.ini
@@ -89,3 +89,5 @@ OPENTOOLS_CHECK_CREDENTIALS="Check and save update credentials"
OPENTOOLS_CHECK_CREDENTIALS_ERROR="Unable to check the download credentials. Please make sure that the plugin is enabled in your Joomla installation!"
OPENTOOLS_XMLMANIFEST_ERROR="Unable to load the plugin manifest file (%s)"
OPENTOOLS_UPDATESCRIPT_ERROR="Unable to load the update information from the update server (%s)"
+OPENTOOLS_COMMERCIAL_UPDATES_J25="Automatic updates of commercial Joomla extensions are not available in Joomla 2.5 (only in Joomla 3.x). Please check the software developer's homepage and manually install updates."
+
diff --git a/language/en-GB/en-GB.plg_vmshopper_ordernumber.sys.ini b/language/en-GB/en-GB.plg_vmshopper_ordernumber.sys.ini
index b22875c59212d7f3fa270bb86d6e87bbb786199f..50611936ddc75423b270926807239efe7741dd68 100644
--- a/language/en-GB/en-GB.plg_vmshopper_ordernumber.sys.ini
+++ b/language/en-GB/en-GB.plg_vmshopper_ordernumber.sys.ini
@@ -89,3 +89,5 @@ OPENTOOLS_CHECK_CREDENTIALS="Check and save update credentials"
OPENTOOLS_CHECK_CREDENTIALS_ERROR="Unable to check the download credentials. Please make sure that the plugin is enabled in your Joomla installation!"
OPENTOOLS_XMLMANIFEST_ERROR="Unable to load the plugin manifest file (%s)"
OPENTOOLS_UPDATESCRIPT_ERROR="Unable to load the update information from the update server (%s)"
+OPENTOOLS_COMMERCIAL_UPDATES_J25="Automatic updates of commercial Joomla extensions are not available in Joomla 2.5 (only in Joomla 3.x). Please check the software developer's homepage and manually install updates."
+
diff --git a/library/ordernumber_helper.php b/library/ordernumber_helper.php
index 2b504bc7188d0738e66ab80aa4d08f42bc1f68e1..4a9ee5e17da48b7a0a26feb6a58eb324afa19bc8 100644
--- a/library/ordernumber_helper.php
+++ b/library/ordernumber_helper.php
@@ -367,7 +367,7 @@ class OrdernumberHelper {
$format = $this->setupNumberFormatString($fmt, $type, $order, $reps);
$format = $this->doReplacements($format, $reps);
$ctrsettings = $this->extractCounterSettings ($format, $type, $ctrsettings);
-JFactory::getApplication()->enqueueMessage("<pre>Counter Settings: ".print_r($ctrsettings,1)."</pre>", 'error');
+// JFactory::getApplication()->enqueueMessage("<pre>Counter Settings: ".print_r($ctrsettings,1)."</pre>", 'error');
// JFactory::getApplication()->enqueueMessage("<pre>Replacements for $type:".print_r($reps,1)."</pre>", 'error');
// Increment the counter only if the format contains a placeholder for it!
if (strpos($ctrsettings["${type}_format"], "#") !== false) {
diff --git a/ordernumber.php b/ordernumber.php
index 58054c02390f6107bce5ad9406ddf5641d1adbc7..dbac4cd7f785568efd79178826866dc07e53e783 100644
--- a/ordernumber.php
+++ b/ordernumber.php
@@ -348,7 +348,13 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
// append the order number and password and check whether access is
// possible.
$json['success'] = FALSE;
- $xml = simplexml_load_file($this->_xmlFile);
+ if (isset($this->_xmlFile)) {
+ $xmlfile = $this->_xmlFile;
+ } else {
+ // VM 2 does not set the _xmlFile property, so construct it manually
+ $xmlfile = JPATH_SITE . '/plugins/' . $this->_type . '/' . $this->_name . '/' . $this->_name . '.xml';
+ }
+ $xml = simplexml_load_file($xmlfile);
if (!$xml || !isset($xml->updateservers)) {
JFactory::getApplication()->enqueueMessage(JText::sprintf('OPENTOOLS_XMLMANIFEST_ERROR', $this->_xmlFile), 'error');
return $json;
@@ -461,6 +467,8 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
if ($orderpass!='') {
$extra_query[] = 'order_pass='.preg_replace("/[^-A-Za-z0-9_]/", '', $orderpass);
}
+ // Joomla 2.5 needs the filename to end in .zip:
+ $extra_query[] = 'filetype=.zip';
$extra_query = implode('&', $extra_query);
// The following code is based on Nicholas K. Dionysopoulos' Joomla Pull request:
diff --git a/releases/plg_vmshopper_ordernumber_v3.99.zip b/releases/plg_vmshopper_ordernumber_v3.99.zip
index 07967949e733c80d540e2655c4bdd6c0cd82a28c..ddd7a57c6b52e35b8e6d330f7ea64946b652fd30 100644
Binary files a/releases/plg_vmshopper_ordernumber_v3.99.zip and b/releases/plg_vmshopper_ordernumber_v3.99.zip differ