From e36b84f3010d28bcb30f31597f03c5aa889e6af1 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 30 Jul 2018 08:10:50 +0200 Subject: [PATCH] Stable Release of version 2.8.5 --- README.md | 8 ++++---- admin/README.txt | 8 ++++---- admin/compiler/joomla_3/Helper_email.php | 11 ++++------- admin/helpers/componentbuilderemail.php | 11 ++++------- admin/language/en-GB/en-GB.com_componentbuilder.ini | 2 +- admin/models/import_joomla_components.php | 2 +- admin/views/import_joomla_components/tmpl/default.php | 8 ++++---- componentbuilder.xml | 6 +++--- componentbuilder_update_server.xml | 4 ++-- script.php | 2 +- 10 files changed, 28 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 0b2f2c660..38a59c502 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.4) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.5) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -125,11 +125,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 23rd July, 2018 -+ *Version*: 2.8.4 ++ *Last Build*: 30th July, 2018 ++ *Version*: 2.8.5 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **186363** ++ *Line count*: **186360** + *Field count*: **1059** + *File count*: **1239** + *Folder count*: **197** diff --git a/admin/README.txt b/admin/README.txt index 0b2f2c660..38a59c502 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.4) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.5) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -125,11 +125,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 23rd July, 2018 -+ *Version*: 2.8.4 ++ *Last Build*: 30th July, 2018 ++ *Version*: 2.8.5 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **186363** ++ *Line count*: **186360** + *Field count*: **1059** + *File count*: **1239** + *Folder count*: **197** diff --git a/admin/compiler/joomla_3/Helper_email.php b/admin/compiler/joomla_3/Helper_email.php index 91448563f..a75d36ad2 100644 --- a/admin/compiler/joomla_3/Helper_email.php +++ b/admin/compiler/joomla_3/Helper_email.php @@ -138,17 +138,17 @@ abstract class ###Component###Email $replyto = $conf->get('replyto'); $replytoname = $conf->get('replytoname'); } + + // Set global sender + $mail->setSender(array($mailfrom, $fromname)); // set the global reply-to if found if ($replyto && $replytoname) { $mail->ClearReplyTos(); - $mail->addReplyTo( array( $replyto, $replytoname ) ); + $mail->addReplyTo($replyto, $replytoname); } - // Set global sender - $mail->setSender(array($mailfrom, $fromname)); - // Default mailer is to use PHP's mail function switch ($mailer) { @@ -196,9 +196,6 @@ abstract class ###Component###Email // set component params $conf = self::getConfig(); - // do some house cleaning - $mail->ClearReplyTos(); - // set if we have override if ($mailfrom && $fromname) { diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index ea1f40999..30e51e487 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -121,17 +121,17 @@ abstract class ComponentbuilderEmail $replyto = $conf->get('replyto'); $replytoname = $conf->get('replytoname'); } + + // Set global sender + $mail->setSender(array($mailfrom, $fromname)); // set the global reply-to if found if ($replyto && $replytoname) { $mail->ClearReplyTos(); - $mail->addReplyTo( array( $replyto, $replytoname ) ); + $mail->addReplyTo($replyto, $replytoname); } - // Set global sender - $mail->setSender(array($mailfrom, $fromname)); - // Default mailer is to use PHP's mail function switch ($mailer) { @@ -179,9 +179,6 @@ abstract class ComponentbuilderEmail // set component params $conf = self::getConfig(); - // do some house cleaning - $mail->ClearReplyTos(); - // set if we have override if ($mailfrom && $fromname) { diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index bc7dc8c42..f46613c0a 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -1003,8 +1003,8 @@ COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY="Backup was done successfully" COM_COMPONENTBUILDER_BACK_TO_LIBRARIES="Back to Libraries" COM_COMPONENTBUILDER_BADMIN_FIELDS_RELATIONSB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_NOT_UPDATED_IN_THE_CUSTOM_CODE="Admin fields relations id:%s mismatch in field:%s, and was not updated in the custom code." COM_COMPONENTBUILDER_BASIC_TUTORIAL_ON_GIT_BSB="Basic Tutorial on git: %s" -COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE="Best to not continue!
This package FAILED checksum validation, this could be a serious security breach! DO NOT CONTINUE!!!" COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_WE_COULD_NOT_LOAD_THE_CHECKSUM_FOR_THIS_PACKAGE_AND_SO_NO_VALIDATION_WAS_POSSIBLE_THIS_MAY_BE_DUE_TO_YOUR_NETWORK_OR_A_CHANGE_TO_THAT_PACKAGE_NAME="Best to not continue!
We could not load the checksum for this package, and so no validation was possible. This may be due to your network, or a change to that package name." +COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_YOU_CAN_REFRESH_AND_TRY_AGAINBR_BUT_NOTE_THAT_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE="Best to not continue!
You can Refresh and try again.
But note that this package FAILED checksum validation, this could be a serious security breach! DO NOT CONTINUE!!!" COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVED_TO_CORRECT_LOCATION="Custom files not moved to correct location!" COM_COMPONENTBUILDER_BEHIND="Behind" COM_COMPONENTBUILDER_BEHIND_MEANS_YOUR_BLOCAL_SNIPPETB_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_A_BOLDER_MODIFIED_DATEB_THEN_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE="Behind means your local snippet (with the same name, library and type) has a older modified date then the community snippet (with the same name, library and type)." diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index e062fa750..9c5a8fe70 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -300,7 +300,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // set error if (!$checksum) { - $checksumMessage = JText::_('COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE'); + $checksumMessage = JText::_('COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_YOU_CAN_REFRESH_AND_TRY_AGAINBR_BUT_NOTE_THAT_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE'); $checksumStatus = 'error'; } } diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 99a49a51e..13dd83eef 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -281,7 +281,7 @@ jQuery(document).ready(function($) {
-

+

@@ -296,7 +296,7 @@ jQuery(document).ready(function($) {
   
-
+
@@ -312,7 +312,7 @@ jQuery(document).ready(function($) {
-

+

@@ -327,7 +327,7 @@ jQuery(document).ready(function($) {
   
-
+
diff --git a/componentbuilder.xml b/componentbuilder.xml index 6554c85e1..d9d3bacea 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 23rd July, 2018 + 30th July, 2018 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 2.8.4 + 2.8.5 Component Builder (v.2.8.4) +

Component Builder (v.2.8.5)

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index 6cb6f4e77..5a043e195 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -429,10 +429,10 @@ Builds Complex Joomla Components com_componentbuilder component - 2.8.4 + 2.8.5 http://www.joomlacomponentbuilder.com - https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.4/JCB_v2.8.4.zip + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.5/JCB_v2.8.5.zip stable diff --git a/script.php b/script.php index 936d47924..c8d8c0f28 100644 --- a/script.php +++ b/script.php @@ -4991,7 +4991,7 @@ class com_componentbuilderInstallerScript echo ' -

Upgrade to Version 2.8.4 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.8.5 Was Successful! Let us know if anything is not working as expected.

'; } }