joomla/Component-Builder
39
25
Fork 11
Code Issues 78 Pull Requests Projects 4 Wiki Activity

Added option to add source link to JCB packages, this also improved the JCB package import area

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-05-05 16:47:48 +02:00
parent 7cb78222ea
commit 476a0c525a
17 changed files with 215 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin/models/ajax.php
View File

@ -127,7 +127,8 @@ class ComponentbuilderModelAjax extends JModelList
if ($info = ComponentbuilderHelper::getFileContents($url, false))
{
// Get the encryption object.
$opener = new FOFEncryptAes('V4stD3vel0pmEntMethOd@YoUrS3rv!s', 128);
$db = 'COM_COMPONENTBUILDER_VJRZDESSMHBTRWFIFTYTWVZEROAESFLVVXJTMTHREEJTWOIXM';
$opener = new FOFEncryptAes(base64_decode(JText::sprintf($db, 'QzdmV', '9kQ')), 128);
$info = rtrim($opener->decryptString($info), "\0");
// check if we have json
if (ComponentbuilderHelper::checkJson($info))

12
admin/models/forms/joomla_component.xml
View File

@ -943,20 +943,20 @@
<option value="0">
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
</field>
<!-- Export_package_link Field. Type: Url. (joomla) -->
<!-- Joomla_source_link Field. Type: Url. (joomla) -->
<field
type="url"
name="export_package_link"
label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_LABEL"
name="joomla_source_link"
label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_LABEL"
size="60"
maxlength="150"
description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_DESCRIPTION"
description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_DESCRIPTION"
class="text_area"
required="false"
filter="url"
validated="url"
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_HINT"
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_HINT"
/>
<!-- Add_php_preflight_update Field. Type: Radio. (joomla) -->
<field

9
admin/models/import_joomla_components.php
View File

@ -344,7 +344,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
if ($info === base64_encode(base64_decode($info, true)))
{
// Get the encryption object.
$opener = new FOFEncryptAes('V4stD3vel0pmEntMethOd@YoUrS3rv!s', 128);
$db = 'COM_COMPONENTBUILDER_VJRZDESSMHBTRWFIFTYTWVZEROAENINEKQFLVVXJTMTHREEJTWOIXM';
$opener = new FOFEncryptAes(base64_decode(JText::sprintf($db, 'QzdmV')), 128);
$info = rtrim($opener->decryptString($info), "\0");
$session->set('smart_package_info', $info);
return true;
@ -1703,6 +1704,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
$item->update_server = $item->update_server_ftp;
unset($item->update_server_ftp);
}
// rename export_package_link field
if (isset($item->export_package_link))
{
$item->joomla_source_link = $item->export_package_link;
unset($item->export_package_link);
}
// repeatable fields to update
$updaterR = array(
// repeatablefield => checker

27
admin/models/joomla_components.php
View File

@ -62,7 +62,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
public $zipPath = false;
public $key = array();
public $exportBuyLinks = array();
public $exportPackageLinks = array();
public $joomlaSourceLinks = array();
public $info = array(
'name' => array(),
'short_description' => array(),
@ -259,14 +259,14 @@ class ComponentbuilderModelJoomla_components extends JModelList
// set the export buy links
if (isset($item->export_buy_link) && ComponentbuilderHelper::checkString($item->export_buy_link))
{
// keep the key locked for exported data set
$this->exportBuyLinks[$keyName] = $item->export_buy_link;
// set the export buy link
$this->info['export_buy_link'][$item->id] = $item->export_buy_link;
}
// set the export buy links
if (isset($item->export_package_link) && ComponentbuilderHelper::checkString($item->export_package_link))
if (isset($item->joomla_source_link) && ComponentbuilderHelper::checkString($item->joomla_source_link))
{
// keep the key locked for exported data set
$this->exportPackageLinks[$keyName] = $item->export_package_link;
// set the source link
$this->info['joomla_source_link'][$item->id] = $item->joomla_source_link;
}
// component image
$this->moveIt(array($item->image), 'image');
@ -919,17 +919,19 @@ class ComponentbuilderModelJoomla_components extends JModelList
$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)
// add buy link if only one link is set
if (isset($this->info['export_buy_link']) && ComponentbuilderHelper::checkArray($this->info['export_buy_link']) && count((array) $this->info['export_buy_link']) == 1)
{
$this->info['getKeyFrom']['buy_links'] = $this->exportBuyLinks;
$this->info['getKeyFrom']['buy_link'] = array_values($this->info['export_buy_link'])[0];
}
else
{
// use global if more then one component is exported, or if none has a buy link
// use global if more then one component is exported (since they now have one key), or if none has a buy link
$this->info['getKeyFrom']['buy_link'] = $this->params->get('export_buy_link', null);
}
$this->info['getKeyFrom']['package_links'] = $this->exportPackageLinks;
// no remove the buy links
unset($this->info['export_buy_link']);
// if we have multi links add them also
// we started adding this at v2.7.7
$this->info['key'] = true;
}
@ -948,7 +950,8 @@ class ComponentbuilderModelJoomla_components extends JModelList
return false;
}
// set info data
$locker = new FOFEncryptAes('V4stD3vel0pmEntMethOd@YoUrS3rv!s', 128);
$db = 'COM_COMPONENTBUILDER_SZDEQZDMVSMHBTRWFIFTYTSQFLVVXJTMTHREEJTWOIXM';
$locker = new FOFEncryptAes(base64_decode(JText::sprintf($db, 'VjR', 'WV0aE9k')), 128);
$info = $locker->encryptString(json_encode($this->info));
// set the path
$infoPath = $this->packagePath . '/info.vdm';