From f7eabbbf35942cdea94798dd875acfcd9b3b0f7a Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 17 May 2018 03:02:11 +0200 Subject: [PATCH] Fixed the email helper class to match the custom global field value. Removed the spinner from export data option in the language translation area. Fixed the dynamic dashboard to be able to check if the view was found in the component. Updated the readme to reflect the new terms of gaining access to demo content. --- README.md | 17 ++++++------- admin/README.txt | 17 ++++++------- admin/compiler/joomla_3/Helper_email.php | 2 +- admin/helpers/compiler/b_Structure.php | 11 +++++--- admin/helpers/componentbuilderemail.php | 2 +- .../language_translations/tmpl/default.php | 25 +------------------ componentbuilder.xml | 2 +- 7 files changed, 28 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index d094258f1..4df08543f 100644 --- a/README.md +++ b/README.md @@ -82,13 +82,12 @@ You are in Control Get More Demo Content ==================== -> **You can purchase more [demo content](http://vdm.bz/jcb-packages) for Component Builder:** +> The cat is out of the bag, JCB fully mapped can now be yours! Including many other JCB mapped components. + +### All you need to do is [explained here](https://vdm.bz/how-to-get-free-vdm-package-keys)! + +To install these packages [watch this tutorial](https://vdm.bz/how-to-install-jcb-packages). -+ *Demo Component* see the build on [github](https://github.com/namibia/demo-joomla-3-component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demo.zip) _(free)_ -+ *Advance Demo Component* get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demoAdvanced.zip) _([buy key](http://vdm.bz/get-advance-demo-key))_ -+ *Sermon Distributor* see the build on [github](https://github.com/SermonDistributor/Joomla-3-Component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_sermondistributor.zip) _([buy key](http://vdm.bz/get-sermon-distributor-key))_ -+ *Location Data* see the build on [github](https://github.com/vdm-io/Joomla-Location-Data) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_locationData.zip) _([buy key](http://vdm.bz/get-location-data-key))_ -+ *More Coming...* Where can you get support and help? ==================== @@ -118,7 +117,7 @@ Our idea was to almost let this tool serve as a cheat sheet to how things can be MAKING IT BETTER! ==================== -Component Builder is mapped as a component in itself on my local development environment. So we are improving it like you would any other component in it. I am looking for developers with the **skill** and the **desire** to really join us... and then we will [possible give them access](https://www.youtube.com/watch?v=lLOfx9YA7VQ&list=PLQRGFI8XZ_wsfz3NdKawCiYsALuZ-GhwJ) to this, so we can all help improve this simple, yet advanced tool. +Watch the [proposed development workflow](https://vdm.bz/proposed-development-workflow). # Build Details @@ -126,11 +125,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 11th May, 2018 ++ *Last Build*: 17th May, 2018 + *Version*: 2.7.10 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **194639** ++ *Line count*: **194614** + *Field count*: **1036** + *File count*: **1203** + *Folder count*: **193** diff --git a/admin/README.txt b/admin/README.txt index d094258f1..4df08543f 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -82,13 +82,12 @@ You are in Control Get More Demo Content ==================== -> **You can purchase more [demo content](http://vdm.bz/jcb-packages) for Component Builder:** +> The cat is out of the bag, JCB fully mapped can now be yours! Including many other JCB mapped components. + +### All you need to do is [explained here](https://vdm.bz/how-to-get-free-vdm-package-keys)! + +To install these packages [watch this tutorial](https://vdm.bz/how-to-install-jcb-packages). -+ *Demo Component* see the build on [github](https://github.com/namibia/demo-joomla-3-component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demo.zip) _(free)_ -+ *Advance Demo Component* get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demoAdvanced.zip) _([buy key](http://vdm.bz/get-advance-demo-key))_ -+ *Sermon Distributor* see the build on [github](https://github.com/SermonDistributor/Joomla-3-Component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_sermondistributor.zip) _([buy key](http://vdm.bz/get-sermon-distributor-key))_ -+ *Location Data* see the build on [github](https://github.com/vdm-io/Joomla-Location-Data) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_locationData.zip) _([buy key](http://vdm.bz/get-location-data-key))_ -+ *More Coming...* Where can you get support and help? ==================== @@ -118,7 +117,7 @@ Our idea was to almost let this tool serve as a cheat sheet to how things can be MAKING IT BETTER! ==================== -Component Builder is mapped as a component in itself on my local development environment. So we are improving it like you would any other component in it. I am looking for developers with the **skill** and the **desire** to really join us... and then we will [possible give them access](https://www.youtube.com/watch?v=lLOfx9YA7VQ&list=PLQRGFI8XZ_wsfz3NdKawCiYsALuZ-GhwJ) to this, so we can all help improve this simple, yet advanced tool. +Watch the [proposed development workflow](https://vdm.bz/proposed-development-workflow). # Build Details @@ -126,11 +125,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 11th May, 2018 ++ *Last Build*: 17th May, 2018 + *Version*: 2.7.10 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **194639** ++ *Line count*: **194614** + *Field count*: **1036** + *File count*: **1203** + *Folder count*: **193** diff --git a/admin/compiler/joomla_3/Helper_email.php b/admin/compiler/joomla_3/Helper_email.php index fa5327a23..a0399c52b 100644 --- a/admin/compiler/joomla_3/Helper_email.php +++ b/admin/compiler/joomla_3/Helper_email.php @@ -126,7 +126,7 @@ abstract class ###Component###Email $smtpsecure = $conf->get('smtpsecure'); $smtpport = $conf->get('smtpport'); $sendmail = $conf->get('sendmail'); - $mailfrom = $conf->get('mailfrom'); + $mailfrom = $conf->get('emailfrom'); $fromname = $conf->get('fromname'); $replyto = $conf->get('replyto'); $replytoname = $conf->get('replytoname'); diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index b30c62375..3ffa32761 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -573,10 +573,15 @@ class Structure extends Get } return false; }); - // check if view was found (this should be true) - if (count($dashboard) && isset($dashboard[0]['settings']) && isset($dashboard[0]['settings']->{$keys[$t]})) + // set dashboard + if (ComponentbuilderHelper::checkArray($dashboard)) { - $this->dynamicDashboard = ComponentbuilderHelper::safeString($dashboard[0]['settings']->{$keys[$t]}); + $dashboard = array_values($dashboard)[0]; + } + // check if view was found (this should be true) + if (isset($dashboard['settings']) && isset($dashboard['settings']->{$keys[$t]})) + { + $this->dynamicDashboard = ComponentbuilderHelper::safeString($dashboard['settings']->{$keys[$t]}); } else { diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index 075097f56..d9ad9a472 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -123,7 +123,7 @@ abstract class ComponentbuilderEmail $smtpsecure = $conf->get('smtpsecure'); $smtpport = $conf->get('smtpport'); $sendmail = $conf->get('sendmail'); - $mailfrom = $conf->get('mailfrom'); + $mailfrom = $conf->get('emailfrom'); $fromname = $conf->get('fromname'); $replyto = $conf->get('replyto'); $replytoname = $conf->get('replytoname'); diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php index 45a498a61..b69f3cb74 100644 --- a/admin/views/language_translations/tmpl/default.php +++ b/admin/views/language_translations/tmpl/default.php @@ -96,27 +96,4 @@ if ($this->saveOrder) - - \ No newline at end of file + \ No newline at end of file diff --git a/componentbuilder.xml b/componentbuilder.xml index 15c8a7ad5..ba09d738c 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 11th May, 2018 + 17th May, 2018 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://joomlacomponentbuilder.com