Futher improved the JCB package manager, so to be more stable and give enough information about selected packages

2018-05-02 16:47:01 +02:00
parent dfef0774f3
commit d961652f56
12 changed files with 188 additions and 141 deletions
--- 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.7.6) 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.7.7) 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)

@@ -127,10 +127,10 @@ Component Builder is mapped as a component in itself on my local development env
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
 + *Last Build*: 2nd May, 2018
-+ *Version*: 2.7.6
+ *Version*: 2.7.7
 + *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*: **193883**
+ *Line count*: **193930**
 + *Field count*: **1027**
 + *File count*: **1201**
 + *Folder count*: **193**
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@@ -163,40 +163,9 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 					$keyNotice = '<h1>' . JText::sprintf('COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE', $model->key) . '</h1>';
 					$keyNotice .= '<p>' . JText::_('COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEYBR_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY') . '</h1>';
 					// set the package owner info
-					if ((isset($model->info['getKeyFrom']['company']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['company'])) || (isset($model->info['getKeyFrom']['owner']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['owner'])))
+					if (componentbuilderHelper::getPackageOwnerValue('owner', $model->info) || componentbuilderHelper::getPackageOwnerValue('company', $model->info))
 					{
-						$ownerDetails = '<h2>' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS') . '</h2>';
-						$ownerDetails .= '<ul>';
-						if (isset($model->info['getKeyFrom']['company']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['company']))
-						{
-							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOMPANYEM_BSB', $model->info['getKeyFrom']['company']) . '</li>';
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['owner']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['owner']))
-						{
-							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMOWNEREM_BSB', $model->info['getKeyFrom']['owner']) . '</li>';
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['website']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['website']))
-						{
-							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMWEBSITEEM_BSB', $model->info['getKeyFrom']['website']) . '</li>';
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['email']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['email']))
-						{
-							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMEMAILEM_BSB', $model->info['getKeyFrom']['email']) . '</li>';
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['license']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['license']))
-						{
-							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMLICENSEEM_BSB', $model->info['getKeyFrom']['license']) . '</li>';
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['copyright']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['copyright']))
-						{
-							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB', $model->info['getKeyFrom']['copyright']) . '</li>';
-						}							
-						$ownerDetails .= '</ul>';
+						$ownerDetails = componentbuilderHelper::getPackageOwnerDetailsDisplay($model->info, true);
 					}
 					else
 					{
--- a/admin/helpers/componentbuilder.php
+++ b/admin/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 = '<h2 class="module-title nav-header">' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS') . '</h2>';
 		$ownerDetails .= '<ul>';
-		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 .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOMPANYEM_BSB', $info['getKeyFrom']['company']) . '</li>';
-		}
-		// 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 .= '<li>' . JText::sprintf($li, $value) . '</li>';
+				// check if we have a owner/source name
+				if (('owner' === $key || 'company' === $key) && !$hasOwner)
+				{
+					$hasOwner = true;
+					$owner = $value;
+				}
 			}
-			$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMOWNEREM_BSB', $info['getKeyFrom']['owner']) . '</li>';
-		}
-		// add value only if set
-		if (isset($info['getKeyFrom']['website']) && self::checkString($info['getKeyFrom']['website']))
-		{
-			$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMWEBSITEEM_BSB', $info['getKeyFrom']['website']) . '</li>';
-		}
-		// add value only if set
-		if (isset($info['getKeyFrom']['email']) && self::checkString($info['getKeyFrom']['email']))
-		{
-			$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMEMAILEM_BSB', $info['getKeyFrom']['email']) . '</li>';
-		}
-		// add value only if set
-		if (isset($info['getKeyFrom']['license']) && self::checkString($info['getKeyFrom']['license']))
-		{
-			$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMLICENSEEM_BSB', $info['getKeyFrom']['license']) . '</li>';
-		}
-		// add value only if set
-		if (isset($info['getKeyFrom']['copyright']) && self::checkString($info['getKeyFrom']['copyright']))
-		{
-			$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB', $info['getKeyFrom']['copyright']) . '</li>';
-		}							
+		}				
 		$ownerDetails .= '</ul>';

 		// provide some details to how the user can get a key
-		if (isset($info['getKeyFrom']['buy_link']) && self::checkString($info['getKeyFrom']['buy_link']))
+		if ($hasOwner && isset($info['getKeyFrom']['buy_link']) && self::checkString($info['getKeyFrom']['buy_link']))
 		{
 			$ownerDetails .= '<hr />';
 			$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 .= '<hr />';
 			$ownerDetails .= implode('<br />', $buttons);
 		}
-
 		// return the owner details
-		if (!isset($owner) && !$trust)
+		if (!$hasOwner)
 		{
-			$ownerDetails = '<h2 style="color: #922924;">' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND') . '</h2>';
-			$ownerDetails .= '<p style="color: #922924;">' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '</p>';
-		}
-		elseif (!isset($owner) && $trust)
-		{
-			$ownerDetails = '';
+			$ownerDetails = '<h2>' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND') . '</h2>';
+			if (!$trust)
+			{
+				$ownerDetails .= '<p style="color: #922924;">' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '</p>';
+			}
 		}
 		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[] = '<div class="well well-small ' . $class2 . '">';
 				$display[] = '<h2 class="module-title nav-header">';
 				$display[] = JText::sprintf('COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM', $value . ' v' . $info['component_version'][$key]);
+				if ($needKey)
+				{
+					$display[] = ' - <em>' . JText::sprintf('COM_COMPONENTBUILDER_PAIDLOCKED') . '</em>';
+				}
+				else
+				{
+					$display[] = ' - <em>' . JText::sprintf('COM_COMPONENTBUILDER_FREEOPEN') . '</em>';
+				}
 				$display[] = '</h2><p>';
 				$display[] = $info['short_description'][$key];
 				$display[] = '</p><ul><li>';
@@ -2171,7 +2201,7 @@ abstract class ComponentbuilderHelper
 			}
 			return implode("\n",$display);
 		}
-		return '<div>'.JText::_('COM_COMPONENTBUILDER_COPYRIGHT').'</div>';
+		return '<div>'.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').'</div>';
 	}

 	/**
--- 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="<em>Author</em>: <b>%s</b>"
 COM_COMPONENTBUILDER_EMCOMPANYEM_BSB="<em>Company:</em> <b>%s</b>"
 COM_COMPONENTBUILDER_EMCOMPANY_NAMEEM_BSB="<em>Company Name</em>: <b>%s</b>"
 COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB="<em>Copyright:</em> <b>%s</b>"
-COM_COMPONENTBUILDER_EMEMAILEM_BSB="<em>Email:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EMEMAILEM_BSB="<em>Email</em>: <b>%s</b>"
 COM_COMPONENTBUILDER_EMLICENSEEM_BSB="<em>License:</em> <b>%s</b>"
 COM_COMPONENTBUILDER_EMOWNEREM_BSB="<em>Owner:</em> <b>%s</b>"
-COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="<em>Website:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="<em>Website</em>: <b>%s</b>"
 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 <b>creation</b> and <b>modified date</b>."
 COM_COMPONENTBUILDER_ERROR="Error"
@@ -4038,6 +4038,7 @@ COM_COMPONENTBUILDER_FOLDER="Folder"
 COM_COMPONENTBUILDER_FOLDER_BSB_WAS_MOVED_TO_BSB="Folder <b>%s</b> was moved to <b>%s</b>"
 COM_COMPONENTBUILDER_FOLDER_BSB_WAS_NOT_MOVED_TO_BSB="Folder <b>%s</b> was not moved to <b>%s</b>"
 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: <b>%s</b>"
@@ -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: <code>%s</code>"
 COM_COMPONENTBUILDER_PATH_TO_THE_ZIPPED_PACKAGE_IS_CODESCODE_BR_S_S="Path to the zipped package is: <code>%s</code> <br />%s %s"
 COM_COMPONENTBUILDER_PERMISSIONS="Permissions"
--- 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);
 			}
--- 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))
 			{