'; $display[] = JText::sprintf('COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM', $value . ' v' . $info['component_version'][$key]); + if ($needKey) + { + $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_PAIDLOCKED') . ''; + } + else + { + $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_FREEOPEN') . ''; + } $display[] = '
'; $display[] = $info['short_description'][$key]; $display[] = '
- ';
@@ -2171,7 +2201,7 @@ abstract class ComponentbuilderHelper
}
return implode("\n",$display);
}
- return ''.JText::_('COM_COMPONENTBUILDER_COPYRIGHT').''; + return ''.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').''; } /** diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index f2d4c64ea..ba9d58d1f 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -3627,10 +3627,10 @@ COM_COMPONENTBUILDER_EMAUTHOREM_BSB="Author: %s" COM_COMPONENTBUILDER_EMCOMPANYEM_BSB="Company: %s" COM_COMPONENTBUILDER_EMCOMPANY_NAMEEM_BSB="Company Name: %s" COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB="Copyright: %s" -COM_COMPONENTBUILDER_EMEMAILEM_BSB="Email: %s" +COM_COMPONENTBUILDER_EMEMAILEM_BSB="Email: %s" COM_COMPONENTBUILDER_EMLICENSEEM_BSB="License: %s" COM_COMPONENTBUILDER_EMOWNEREM_BSB="Owner: %s" -COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="Website: %s" +COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="Website: %s" COM_COMPONENTBUILDER_EQUAL="Equal" COM_COMPONENTBUILDER_EQUAL_MEANS_THAT_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_AND_YOUR_LOCAL_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_THE_SAME_BCREATIONB_AND_BMODIFIED_DATEB="Equal means that the community snippet (with the same name, library and type) and your local snippet (with the same name, library and type) has the same creation and modified date." COM_COMPONENTBUILDER_ERROR="Error" @@ -4038,6 +4038,7 @@ COM_COMPONENTBUILDER_FOLDER="Folder" COM_COMPONENTBUILDER_FOLDER_BSB_WAS_MOVED_TO_BSB="Folder %s was moved to %s" COM_COMPONENTBUILDER_FOLDER_BSB_WAS_NOT_MOVED_TO_BSB="Folder %s was not moved to %s" COM_COMPONENTBUILDER_FORCE_LOCAL_UPDATE="Force Local Update" +COM_COMPONENTBUILDER_FREEOPEN="Free/Open" COM_COMPONENTBUILDER_FULL_WIDTH_IN_TAB="Full Width in Tab" COM_COMPONENTBUILDER_FUNCTION_NAME_ALREADY_TAKEN_PLEASE_TRY_AGAIN="Function name already taken, please try again." COM_COMPONENTBUILDER_GENERAL_OVERVIEW_OF_HOW_THINGS_WORK_BSB="General overview of how things work: %s" @@ -5407,6 +5408,7 @@ COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!" COM_COMPONENTBUILDER_NOT_SET="not set" COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!" COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!" +COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE="No component details found, so it is not safe to continue!" COM_COMPONENTBUILDER_NO_COMPONENT_WAS_SELECTED_PLEASE_MAKE_A_SELECTION_OF_ONE_COMPONENT_AND_TRY_AGAIN="No component was selected, please make a selection of one component and try again!" COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S="No cronjob path found for (%s)" COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED="No cronjob path found since incorrect type requested." @@ -5445,6 +5447,7 @@ COM_COMPONENTBUILDER_PACKAGES_FROM_VAST_DEVELOPMENT_METHOD="Packages from Vast D COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS="Package Owner Details" COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND="Package owner details not found!" COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET="Package Owner Not Set" +COM_COMPONENTBUILDER_PAIDLOCKED="Paid/Locked" COM_COMPONENTBUILDER_PATH_CODESCODE="Path:
%s" COM_COMPONENTBUILDER_PATH_TO_THE_ZIPPED_PACKAGE_IS_CODESCODE_BR_S_S="Path to the zipped package is:%s
%s %s" COM_COMPONENTBUILDER_PERMISSIONS="Permissions" diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 749eb03d3..0e634d90e 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -896,21 +896,29 @@ class ComponentbuilderModelJoomla_components extends JModelList { // set db data $data = serialize($this->smartBox); + // Set the key owner information + $this->info['source'] = array(); + $this->info['source']['company'] = $this->params->get('export_company', null); + $this->info['source']['owner'] = $this->params->get('export_owner', null); + $this->info['source']['email'] = $this->params->get('export_email', null); + $this->info['source']['website'] = $this->params->get('export_website', null); + $this->info['source']['license'] = $this->params->get('export_license', null); + $this->info['source']['copyright'] = $this->params->get('export_copyright', null); // lock the data if set if (ComponentbuilderHelper::checkArray($this->key)) { // lock the data $this->key = md5(implode('', $this->key)); $locker = new FOFEncryptAes($this->key, 128); - $data = $locker->encryptString($data); + $data = $locker->encryptString($data); // Set the key owner information $this->info['getKeyFrom'] = array(); - $this->info['getKeyFrom']['company'] = $this->params->get('export_company', null); - $this->info['getKeyFrom']['owner'] = $this->params->get('export_owner', null); - $this->info['getKeyFrom']['email'] = $this->params->get('export_email', null); - $this->info['getKeyFrom']['website'] = $this->params->get('export_website', null); - $this->info['getKeyFrom']['license'] = $this->params->get('export_license', null); - $this->info['getKeyFrom']['copyright'] = $this->params->get('export_copyright', null); + $this->info['getKeyFrom']['company'] = $this->info['source']['company']; + $this->info['getKeyFrom']['owner'] = $this->info['source']['owner']; + $this->info['getKeyFrom']['email'] = $this->info['source']['email']; + $this->info['getKeyFrom']['website'] = $this->info['source']['website']; + $this->info['getKeyFrom']['license'] = $this->info['source']['license']; + $this->info['getKeyFrom']['copyright'] = $this->info['source']['copyright']; // making provision for future changes if (count($this->exportBuyLinks) == 1) { @@ -922,9 +930,13 @@ class ComponentbuilderModelJoomla_components extends JModelList $this->info['getKeyFrom']['buy_link'] = $this->params->get('export_buy_link', null); } $this->info['getKeyFrom']['package_links'] = $this->exportPackageLinks; + // we started adding this at v2.7.7 + $this->info['key'] = true; } else { + // we started adding this at v2.7.7 + $this->info['key'] = false; // Set the owner information $data = base64_encode($data); } diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 437a74ef6..90d4f579b 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -244,7 +244,7 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy // add to form $form[] = $merge; - if (!$this->packageInfo || (isset($this->packageInfo['getKeyFrom']) && ComponentbuilderHelper::checkArray($this->packageInfo['getKeyFrom']))) + if (!$this->packageInfo || ComponentbuilderHelper::getPackageComponentsKeyStatus($this->packageInfo)) { // set required field $required = true; @@ -352,7 +352,7 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy } } } - elseif ('jcb_package' === $type && $jcbListObjects = ComponentbuilderHelper::getGithubRepoFileList('jcbGithubPackages', ComponentbuilderHelper::$jcbGithubPackagesUrl.ComponentbuilderHelper::$accessToken)) + elseif ('jcb_package' === $type && $jcbListObjects = ComponentbuilderHelper::getGithubRepoFileList('communityGithubPackages', ComponentbuilderHelper::$jcbGithubPackagesUrl.ComponentbuilderHelper::$accessToken)) { if (ComponentbuilderHelper::checkArray($jcbListObjects)) { diff --git a/componentbuilder.xml b/componentbuilder.xml index c9ce39260..125d5725b 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -7,9 +7,9 @@http://joomlacomponentbuilder.com Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -2.7.6 +2.7.7 Component Builder (v.2.7.6) + Component Builder (v.2.7.7)
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 e6e3ef180..14c0ca072 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -344,10 +344,10 @@
Builds Complex Joomla Components com_componentbuilder component -2.7.6 +2.7.7 http://joomlacomponentbuilder.com - https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.6/JCB_v2.7.6.zip +https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.7/JCB_v2.7.7.zip stable diff --git a/script.php b/script.php index b4b18579d..6afd7536a 100644 --- a/script.php +++ b/script.php @@ -4878,7 +4878,7 @@ class com_componentbuilderInstallerScript echo '
- Upgrade to Version 2.7.6 Was Successful! Let us know if anything is not working as expected.
'; +Upgrade to Version 2.7.7 Was Successful! Let us know if anything is not working as expected.
'; } } diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 53f5e1789..bbe085c20 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -2042,57 +2042,47 @@ abstract class ComponentbuilderHelper return false; } + protected static $pkOwnerSearch = array( + 'company' => 'COM_COMPONENTBUILDER_EMCOMPANYEM_BSB', + 'owner' => 'COM_COMPONENTBUILDER_EMOWNEREM_BSB', + 'website' => 'COM_COMPONENTBUILDER_EMWEBSITEEM_BSB', + 'email' => 'COM_COMPONENTBUILDER_EMEMAILEM_BSB', + 'license' => 'COM_COMPONENTBUILDER_EMLICENSEEM_BSB', + 'copyright' => 'COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB' + ); + /** * get the JCB package owner details display **/ public static function getPackageOwnerDetailsDisplay(&$info, $trust = false) { + $hasOwner = false; $ownerDetails = '' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS') . '
'; $ownerDetails .= '- ';
- if (isset($info['getKeyFrom']['company']) && self::checkString($info['getKeyFrom']['company']))
+ // load the list items
+ foreach (self::$pkOwnerSearch as $key => $li)
{
- $owner = $info['getKeyFrom']['company'];
- $ownerDetails .= '
- ' . JText::sprintf('COM_COMPONENTBUILDER_EMCOMPANYEM_BSB', $info['getKeyFrom']['company']) . ' '; - } - // add value only if set - if (isset($info['getKeyFrom']['owner']) && self::checkString($info['getKeyFrom']['owner'])) - { - if (!isset($owner)) + if ($value = self::getPackageOwnerValue($key, $info)) { - $owner = $info['getKeyFrom']['owner']; + $ownerDetails .= '
- ' . JText::sprintf($li, $value) . ' '; + // check if we have a owner/source name + if (('owner' === $key || 'company' === $key) && !$hasOwner) + { + $hasOwner = true; + $owner = $value; + } } - $ownerDetails .= '
- ' . JText::sprintf('COM_COMPONENTBUILDER_EMOWNEREM_BSB', $info['getKeyFrom']['owner']) . ' '; - } - // add value only if set - if (isset($info['getKeyFrom']['website']) && self::checkString($info['getKeyFrom']['website'])) - { - $ownerDetails .= '
- ' . JText::sprintf('COM_COMPONENTBUILDER_EMWEBSITEEM_BSB', $info['getKeyFrom']['website']) . ' '; - } - // add value only if set - if (isset($info['getKeyFrom']['email']) && self::checkString($info['getKeyFrom']['email'])) - { - $ownerDetails .= '
- ' . JText::sprintf('COM_COMPONENTBUILDER_EMEMAILEM_BSB', $info['getKeyFrom']['email']) . ' '; - } - // add value only if set - if (isset($info['getKeyFrom']['license']) && self::checkString($info['getKeyFrom']['license'])) - { - $ownerDetails .= '
- ' . JText::sprintf('COM_COMPONENTBUILDER_EMLICENSEEM_BSB', $info['getKeyFrom']['license']) . ' '; - } - // add value only if set - if (isset($info['getKeyFrom']['copyright']) && self::checkString($info['getKeyFrom']['copyright'])) - { - $ownerDetails .= '
- ' . JText::sprintf('COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB', $info['getKeyFrom']['copyright']) . ' '; - } + } $ownerDetails .= '
'; $ownerDetails .= JText::sprintf('COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA', $info['getKeyFrom']['buy_link'], $owner, $owner); } // add more custom links - elseif (isset($info['getKeyFrom']['buy_links']) && self::checkArray($info['getKeyFrom']['buy_links'])) + elseif ($hasOwner && isset($info['getKeyFrom']['buy_links']) && self::checkArray($info['getKeyFrom']['buy_links'])) { $buttons = array(); foreach ($info['getKeyFrom']['buy_links'] as $keyName => $link) @@ -2102,25 +2092,57 @@ abstract class ComponentbuilderHelper $ownerDetails .= '
'; $ownerDetails .= implode('
', $buttons); } - // return the owner details - if (!isset($owner) && !$trust) + if (!$hasOwner) { - $ownerDetails = '' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND') . '
'; - $ownerDetails .= '' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '
'; - } - elseif (!isset($owner) && $trust) - { - $ownerDetails = ''; + $ownerDetails = '' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND') . '
'; + if (!$trust) + { + $ownerDetails .= '' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '
'; + } } return $ownerDetails; } + public static function getPackageOwnerValue($key, &$info) + { + $source = (isset($info['source']) && isset($info['source'][$key])) ? 'source' : ((isset($info['getKeyFrom']) && isset($info['getKeyFrom'][$key])) ? 'getKeyFrom' : false); + if ($source && self::checkString($info[$source][$key])) + { + return $info[$source][$key]; + } + return false; + } + + /** + * get the JCB package component key status + **/ + public static function getPackageComponentsKeyStatus(&$info) + { + // check the package key status + if (!isset($info['key'])) + { + if (isset($info['getKeyFrom']) && isset($info['getKeyFrom']['owner'])) + { + // this just confirms it for older packages + $info['key'] = true; + } + else + { + // this just confirms it for older packages + $info['key'] = false; + } + } + return $info['key']; + } + /** * get the JCB package component details display **/ public static function getPackageComponentsDetailsDisplay(&$info) { + // check if these components need a key + $needKey = self::getPackageComponentsKeyStatus($info); if (isset($info['name']) && self::checkArray($info['name'])) { $cAmount = count((array) $info['name']); @@ -2141,6 +2163,14 @@ abstract class ComponentbuilderHelper $display[] = ''; $display[] = ''; $display[] = JText::sprintf('COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM', $value . ' v' . $info['component_version'][$key]); + if ($needKey) + { + $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_PAIDLOCKED') . ''; + } + else + { + $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_FREEOPEN') . ''; + } $display[] = '
'; $display[] = $info['short_description'][$key]; $display[] = '
- ';
@@ -2171,7 +2201,7 @@ abstract class ComponentbuilderHelper
}
return implode("\n",$display);
}
- return ''.JText::_('COM_COMPONENTBUILDER_COPYRIGHT').''; + return ''.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').''; } /** diff --git a/site/language/en-GB/en-GB.com_componentbuilder.ini b/site/language/en-GB/en-GB.com_componentbuilder.ini index 340f1f5d3..9bb6625ec 100644 --- a/site/language/en-GB/en-GB.com_componentbuilder.ini +++ b/site/language/en-GB/en-GB.com_componentbuilder.ini @@ -23,14 +23,15 @@ COM_COMPONENTBUILDER_EMAUTHOREM_BSB="Author: %s" COM_COMPONENTBUILDER_EMCOMPANYEM_BSB="Company: %s" COM_COMPONENTBUILDER_EMCOMPANY_NAMEEM_BSB="Company Name: %s" COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB="Copyright: %s" -COM_COMPONENTBUILDER_EMEMAILEM_BSB="Email: %s" +COM_COMPONENTBUILDER_EMEMAILEM_BSB="Email: %s" COM_COMPONENTBUILDER_EMLICENSEEM_BSB="License: %s" COM_COMPONENTBUILDER_EMOWNEREM_BSB="Owner: %s" -COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="Website: %s" +COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="Website: %s" COM_COMPONENTBUILDER_ERROR="Error!" COM_COMPONENTBUILDER_EXAMPLE="Example" COM_COMPONENTBUILDER_FILE="File" COM_COMPONENTBUILDER_FOLDER="Folder" +COM_COMPONENTBUILDER_FREEOPEN="Free/Open" COM_COMPONENTBUILDER_GET_THE_KEY_FROM_BSB_FOR_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s for %s" COM_COMPONENTBUILDER_HTWOCURL_NOT_FOUNDHTWOPPLEASE_SETUP_CURL_ON_YOUR_SYSTEM_OR_BCOMPONENTBUILDERB_WILL_NOT_FUNCTION_CORRECTLYP="
Curl Not Found!
Please setup curl on your system, or componentbuilder will not function correctly!
" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY="Joomla Component Builder - Backup Key" @@ -42,12 +43,14 @@ COM_COMPONENTBUILDER_LOCAL="Local" COM_COMPONENTBUILDER_NEW="New" COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!" COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!" +COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE="No component details found, so it is not safe to continue!" COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="No keys were found. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key." COM_COMPONENTBUILDER_OWNER_DETAILS_WAS_SET="Owner details was set" COM_COMPONENTBUILDER_OWNER_S="Owner: %s" COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS="Package Owner Details" COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND="Package owner details not found!" COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET="Package Owner Not Set" +COM_COMPONENTBUILDER_PAIDLOCKED="Paid/Locked" COM_COMPONENTBUILDER_PROPERTY="Property" COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_AN_BACCESS_TOKENB_TO_GETBIBLE_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO="%s
You can add an access token to getBible global options to make authenticated requests. An access token with only public access will do." COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB="Since the owner details are displayed during import process before adding the key, this way if the user/dev does not have the key they can see where to get it."