diff --git a/Makefile b/Makefile index 5a3d454d328517bcc687a504ea2fbe986060b4f0..607687ce6e1dfdcc6e0684aee93ca034194fb93a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment -VERSION=2.4.0 +VERSION=2.4.1 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 diff --git a/elements/rklabel.php b/elements/rklabel.php index beb59c3b615ae669c06e89d965929836faebf601..a4ef4f5ed2d8f6848e6ae0a4884f0bd3b9404058 100644 --- a/elements/rklabel.php +++ b/elements/rklabel.php @@ -1,5 +1,17 @@ <?php -// Check to ensure this file is within the rest of the framework +/*------------------------------------------------------------------------ +# rklabel.php - simple param element to display text +# ------------------------------------------------------------------------ +# author Reinhold Kainhofer, The Open Tools Association +# copyright Copyright (C) 2013 open-tools.net. All Rights Reserved. +# @license - http://www.gnu.org/licenses/gpl.html GNU/GPL +# Websites: http://www.open-tools.net/ +# Technical Support: Forum - http://www.open-tools.net/forum/index.html +-------------------------------------------------------------------------*/ +// no direct access +defined( '_JEXEC' ) or die( 'Restricted access' ); + + // Check to ensure this file is within the rest of the framework defined('JPATH_BASE') or die(); /** diff --git a/elements/vmlengthunit.php b/elements/vmlengthunit.php index dbbe351bde8b9a3db6640acc9a2b15b64a6da00d..1aea5bb9f03f4e52abe0650052ab480fc7d6fb59 100644 --- a/elements/vmlengthunit.php +++ b/elements/vmlengthunit.php @@ -5,7 +5,6 @@ defined('_JEXEC') or die(); * @package VirtueMart * @subpackage Plugins - Elements * @author Valérie Isaksen, Reinhold Kainhofer - * @link http://www.virtuemart.net * @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved. * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php * VirtueMart is free software. This version may have been modified pursuant diff --git a/releases/plg_vmshipment_rules_shipping_advanced_v2.4.1.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..b2cb8b1c5491570dbfaadd800031c166508ddc57 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.1.zip differ diff --git a/releases/plg_vmshipment_rules_shipping_v2.4.1.zip b/releases/plg_vmshipment_rules_shipping_v2.4.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..857d2979780c4d9516a91744722709d1648c1562 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_v2.4.1.zip differ diff --git a/rules_shipping.php b/rules_shipping.php index f042ae12406cd2c9331dc3a418d3b4abcfe5694d..8b4fc1dcf51641695b5327c01886b9678203136a 100644 --- a/rules_shipping.php +++ b/rules_shipping.php @@ -9,7 +9,7 @@ defined ('_JEXEC') or die('Restricted access'); * @package VirtueMart * @subpackage Plugins - shipment * @copyright Copyright (C) 2004-2012 VirtueMart Team - All rights reserved. - * @copyright Copyright (C) 2013 Reinhold Kainhofer, reinhold@kainhofer.com + * @copyright Copyright (C) 2013 Reinhold Kainhofer, office@open-tools.net * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php * VirtueMart is free software. This version may have been modified pursuant * to the GNU General Public License, and as distributed it includes or diff --git a/rules_shipping.xml b/rules_shipping.xml index 6c828bf9178f29c1c18bf7bece58df7041b8b05f..b6628952e375d08f61a5ac46b74dd77dcf356fef 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -3,10 +3,10 @@ <name>VMSHIPMENT_RULES</name> <creationDate>2013-02-08</creationDate> <author>Reinhold Kainhofer</author> - <authorUrl>http://www.kainhofer.com</authorUrl> + <authorUrl>http://www.open-tools.net</authorUrl> <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.4.0</version> + <version>2.4.1</version> <description>VMSHIPMENT_RULES_DESC</description> <files> <filename plugin="rules_shipping">rules_shipping.php</filename> diff --git a/rules_shipping_advanced.php b/rules_shipping_advanced.php index 42edbd3f65e36d337422b6c07d494b04e4062476..c2c099084efb74111e9d4e03f120d27e6f5c2a00 100644 --- a/rules_shipping_advanced.php +++ b/rules_shipping_advanced.php @@ -6,10 +6,9 @@ defined ('_JEXEC') or die('Restricted access'); * Shipment plugin for general, rules-based shipments, like regular postal services with complex shipping cost structures * Advanced part, implementing general mathematical expression evaluation * - * @version $Id$ * @package VirtueMart * @subpackage Plugins - shipment. - * @copyright Copyright (C) 2013 Reinhold Kainhofer, reinhold@kainhofer.com + * @copyright Copyright (C) 2013 Reinhold Kainhofer, office@open-tools.n.et * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php * VirtueMart is free software. This version may have been modified pursuant * to the GNU General Public License, and as distributed it includes or diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml index 50fd51f7afd5fad5eaf3ef8038d0dda62586e53f..c3eb0e9d9858715a75da040a8f7f3336e9042ada 100644 --- a/rules_shipping_advanced.xml +++ b/rules_shipping_advanced.xml @@ -3,10 +3,10 @@ <name>VMSHIPMENT_RULES_ADV</name> <creationDate>2013-02-08</creationDate> <author>Reinhold Kainhofer</author> - <authorUrl>http://www.kainhofer.com</authorUrl> + <authorUrl>http://www.open-tools.net</authorUrl> <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.4.0</version> + <version>2.4.1</version> <description>VMSHIPMENT_RULES_ADV_DESC</description> <files> <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>