Skip to content
Snippets Groups Projects
Commit c4dc3f19 authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

Version 2.1.2: Fix HTML entities inthe plugin name, like <, > and &

parent 46ba8bf7
No related branches found
No related tags found
No related merge requests found
BASE=rules_shipping
BASE_ADV=rules_shipping_advanced
PLUGINTYPE=vmshipment
VERSION=2.1.1
VERSION=2.1.2
PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE).script.php $(BASE).xml index.html
PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html
TRANSLATIONS=$(call wildcard,language/*/*.plg_$(PLUGINTYPE)_$(BASE).*ini)
TRANSLATIONS=$(call wildcard,language/en*/*.plg_$(PLUGINTYPE)_$(BASE).*ini)
TRANSLATIONS_ADV=$(subst $(BASE),$(BASE_ADV),$(TRANSLATIONS))
INDEXFILES=language/index.html $(call wildcard,language/**/index.html) $(call wildcard,elements/*.html)
ELEMENTS=$(call wildcard,elements/*.php)
......@@ -21,8 +21,8 @@ translations: $(TRANSLATIONS)
@echo $(TRANSLATIONS_ADV)
@cp language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini language/en-GB/en-GB.plg_vmshipment_rules_shipping_advanced.ini
@cp language/en-GB/en-GB.plg_vmshipment_rules_shipping.sys.ini language/en-GB/en-GB.plg_vmshipment_rules_shipping_advanced.sys.ini
@cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.ini
@cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.sys.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.sys.ini
# # @cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.ini
# # @cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.sys.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.sys.ini
zip: $(PLUGINFILES) $(TRANSLATIONS) $(ADVANCEDFILES)
@echo "Packing all files into distribution file $(ZIPFILE):"
......
File added
File added
......@@ -6,7 +6,7 @@
<authorUrl>http://www.kainhofer.com</authorUrl>
<copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright>
<license>GPL v3+</license>
<version>2.1.1</version>
<version>2.1.2</version>
<description>VMSHIPMENT_RULES_DESC</description>
<files>
<filename plugin="rules_shipping">rules_shipping.php</filename>
......
......@@ -6,7 +6,7 @@
<authorUrl>http://www.kainhofer.com</authorUrl>
<copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright>
<license>GPL v3+</license>
<version>2.1.1</version>
<version>2.1.2</version>
<description>VMSHIPMENT_RULES_ADV_DESC</description>
<files>
<filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>
......
......@@ -197,13 +197,13 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
$return = $this->displayLogos ($logos) . ' ';
}
if (!empty($plugin->$plugin_desc)) {
$description = '<span class="' . $this->_type . '_description">' . $plugin->$plugin_desc . '</span>';
$description = '<span class="' . $this->_type . '_description">' . htmlspecialchars($plugin->$plugin_desc) . '</span>';
}
$rulename='';
if (!empty($plugin->rule_name)) {
$rulename=" (".$plugin->rule_name.")";
$rulename=" (".htmlspecialchars($plugin->rule_name).")";
}
$pluginName = $return . '<span class="' . $this->_type . '_name">' . $plugin->$plugin_name . $rulename.'</span>' . $description;
$pluginName = $return . '<span class="' . $this->_type . '_name">' . htmlspecialchars($plugin->$plugin_name) . $rulename.'</span>' . $description;
return $pluginName;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment