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

Major Upgrade away from repeatable fields in Joomla component view. #152

Merged
Llewellyn merged 14 commits from staging into master 2017-10-31 02:13:10 +00:00
Conversation 33 Commits 14 Files Changed 809 +551 -709
19 changed files with 551 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 306a9b9613 - Show all commits

4
README.md
View File

@ -115,8 +115,8 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.6.0
+ *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*: **159673**
+ *File count*: **1000**
+ *Line count*: **159502**
+ *File count*: **999**
+ *Folder count*: **165**
> This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

4
admin/README.txt
View File

@ -115,8 +115,8 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.6.0
+ *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*: **159673**
+ *File count*: **1000**
+ *Line count*: **159502**
+ *File count*: **999**
+ *Folder count*: **165**
> This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

13
admin/helpers/compiler.php
View File

@ -684,9 +684,20 @@ class Compiler extends Infusion
protected function loadEscapedCode($file, $target, $lineBites)
{
// get comment type
if ($target['comment_type'] == 1)
{
$commentType = "// ";
$_commentType = "";
}
else
{
$commentType = "<!--";
$_commentType = " -->";
}
// escape the code
$code = explode(PHP_EOL, $target['code']);
$code = PHP_EOL."// " .implode(PHP_EOL."// ",$code). PHP_EOL;
$code = PHP_EOL . $commentType . implode($_commentType . PHP_EOL . $commentType, $code) . $_commentType . PHP_EOL;
// get place holders
$placeholder = $this->getPlaceHolder((int) $target['comment_type'].$target['type'], $target['id']);
// build the data

9
admin/helpers/compiler/a_Get.php
View File

@ -888,8 +888,9 @@ class Get
}
// build update SQL
if ($old_component = $this->getHistoryWatch('joomla_component', $this->componentID) ||
$old_admin_views = $this->getHistoryWatch('component_admin_views', $component->addadmin_views_id))
$old_admin_views = $this->getHistoryWatch('component_admin_views', $component->addadmin_views_id);
$old_component = $this->getHistoryWatch('joomla_component', $this->componentID);
if ($old_component || $old_admin_views)
{
if (ComponentbuilderHelper::checkObject($old_admin_views))
{
@ -4385,10 +4386,10 @@ class Get
{
switch($commentType)
{
case 1:
case 1: // the PHP & JS type
$startReplace .= '/*'.$id.'*/';
break;
case 2:
case 2: // the HTML type
$startReplace .= '<!--'.$id.'-->';
break;
}

29
admin/helpers/compiler/c_Fields.php
View File

@ -1805,7 +1805,7 @@ class Fields extends Structure
// build unique keys of this view for db
$this->dbUniqueKeys[$viewName][] = $name;
}
elseif (($field['settings']->indexes == 2 || $field['alias'] || $field['title'] || $typeName === 'category') && !in_array($field['settings']->datatype, $textKeys))
elseif (($field['settings']->indexes == 2 || (isset($field['alias']) && $field['alias']) || (isset($field['title']) && $field['title']) || $typeName === 'category') && !in_array($field['settings']->datatype, $textKeys))
{
// build keys of this view for db
$this->dbKeys[$viewName][] = $name;
@ -1817,12 +1817,12 @@ class Fields extends Structure
$this->historyBuilder[$viewName] = $viewName;
}
// set Alias (only one title per view)
if ($field['alias'])
if (isset($field['alias']) && $field['alias'])
{
$this->aliasBuilder[$viewName] = $name;
}
// set Titles (only one title per view)
if ($field['title'])
if (isset($field['title']) && $field['title'])
{
$this->titleBuilder[$viewName] = $name;
}
@ -1855,17 +1855,17 @@ class Fields extends Structure
}
}
// build the list values
if ($field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
if ((isset($field['list']) && $field['list'] == 1) && $typeName != 'repeatable' && $typeName != 'subform')
{
// load to list builder
$this->listBuilder[$listViewName][] = array(
'type' => $typeName,
'code' => $name,
'lang' => $listLangName,
'title' => ($field['title']) ? true : false,
'alias' => ($field['alias']) ? true : false,
'link' => ($field['link']) ? true : false,
'sort' => ($field['sort']) ? true : false,
'title' => (isset($field['title']) && $field['title']) ? true : false,
'alias' => (isset($field['alias']) && $field['alias']) ? true : false,
'link' => (isset($field['link']) && $field['link']) ? true : false,
'sort' => (isset($field['sort']) && $field['sort']) ? true : false,
'custom' => $custom,
'multiple' => $multiple,
'options' => $options);
@ -2004,7 +2004,7 @@ class Fields extends Structure
}
// load the json list display fix
if ($field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
if ((isset($field['list']) && $field['list'] == 1) && $typeName != 'repeatable' && $typeName != 'subform')
{
if (ComponentbuilderHelper::checkArray($options))
{
@ -2031,22 +2031,23 @@ class Fields extends Structure
// check if field should be added to uikit
$this->buildSiteFieldData($viewName, $name, 'uikit', $typeName);
// load the selection translation fix
if (ComponentbuilderHelper::checkArray($options) && $field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
if (ComponentbuilderHelper::checkArray($options) && (isset($field['list']) && $field['list'] == 1) && $typeName != 'repeatable' && $typeName != 'subform')
{
$this->selectionTranslationFixBuilder[$listViewName][$name] = $options;
}
// build the sort values
if ($field['sort'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
if ((isset($field['sort']) && $field['sort'] == 1) && (isset($field['list']) && $field['list'] == 1) && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
{
$this->sortBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom, 'options' => $options);
}
// build the search values
if ($field['search'] == 1)
if (isset($field['search']) && $field['search'] == 1)
{
$this->searchBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'custom' => $custom, 'list' => $field['list']);
$_list = (!isset($field['list'])) ? $field['list'] : 0;
$this->searchBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'custom' => $custom, 'list' => $_list);
}
// build the filter values
if ($field['filter'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
if ((isset($field['filter']) && $field['filter'] == 1) && (isset($field['list']) && $field['list'] == 1) && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
{
$this->filterBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'database' => $viewName, 'function' => ComponentbuilderHelper::safeString($name, 'F'), 'custom' => $custom, 'options' => $options);
}

4
admin/helpers/compiler/e_Interpretation.php
View File

@ -11607,7 +11607,7 @@ class Interpretation extends Fields
$this->langContent[$this->lang][$langKey] = $langName;
$counter++;
}
if ($view['dashboard_list'] == 1)
if (isset($view['dashboard_list']) && $view['dashboard_list'] == 1)
{
$type = ComponentbuilderHelper::imageInfo($view['settings']->icon);
if ($type)
@ -14004,7 +14004,7 @@ function vdm_dkim() {
foreach ($menuControllers as $menuController)
{
// add menu controll view that has menus options
if ($view[$menuController])
if (isset($view[$menuController]) && $view[$menuController])
{
$targetView_ = 'views.';
if ($menuController === 'dashboard_add')

8
admin/helpers/compiler/f_Infusion.php
View File

@ -414,7 +414,7 @@ class Infusion extends Interpretation
$this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
// set the export/import option
if ($view['port'])
if (isset($view['port']) && $view['port'])
{
$this->eximportView[$viewName_list] = true;
if (1 == $view['settings']->add_custom_import)
@ -430,7 +430,7 @@ class Infusion extends Interpretation
}
// set Autocheckin function
if ($view['checkin'] == 1)
if (isset($view['checkin']) && $view['checkin'] == 1)
{
// ###AUTOCHECKIN### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###']
@ -933,12 +933,12 @@ class Infusion extends Interpretation
$this->setLockLicensePer($view['settings']->code, $this->target);
// set the site default view
if ($view['default_view'] == 1)
if (isset($view['default_view']) && $view['default_view'] == 1)
{
$this->fileContentStatic['###SITE_DEFAULT_VIEW###'] = $view['settings']->code;
}
// add site menu
if ($view['menu'] == 1)
if (isset($view['menu']) && $view['menu'] == 1)
{
// ###SITE_MENU_XML### <<<DYNAMIC>>>
$this->fileContentDynamic[$view['settings']->code]['###SITE_MENU_XML###'] = $this->setCustomViewMenu($view);

2
admin/layouts/joomla_component/settings_fullwidth.php
View File

@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
'spacer_hr_d',
'spacer_hr_f',
'note_on_contributors',
'addcontributors',
'emptycontributors',

4
admin/layouts/joomla_component/settings_right.php
View File

@ -31,10 +31,10 @@ $form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
'note_component_files_folders',
'spacer_hr_e',
'spacer_hr_d',
'to_ignore_note',
'toignore',
'spacer_hr_f',
'spacer_hr_e',
'jcb_export_package_note',
'export_key',
'export_package_link',

2
admin/models/custom_codes.php
View File

@ -280,7 +280,7 @@ class ComponentbuilderModelCustom_codes extends JModelList
else
{
$search = $db->quote('%' . $db->escape($search) . '%');
$query->where('(a.component LIKE '.$search.' OR g.system_name LIKE '.$search.' OR a.path LIKE '.$search.' OR a.comment_type LIKE '.$search.' OR a.function_name LIKE '.$search.' OR a.system_name LIKE '.$search.')');
$query->where('(a.component LIKE '.$search.' OR a.path LIKE '.$search.' OR a.comment_type LIKE '.$search.' OR a.function_name LIKE '.$search.' OR a.system_name LIKE '.$search.')');
}
}

2
admin/models/fields.php
View File

@ -312,7 +312,7 @@ class ComponentbuilderModelFields extends JModelList
else
{
$search = $db->quote('%' . $db->escape($search) . '%');
$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')');
$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')');
}
}

171
admin/models/fields/ftps.php
View File

@ -1,171 +0,0 @@
<?php
/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/
__ __ _ _____ _ _ __ __ _ _ _
\ \ / / | | | __ \ | | | | | \/ | | | | | | |
\ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| |
\ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
\ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| |
\/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_|
| |
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 30th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage ftps.php
@author Llewellyn van der Merwe <http://vdm.bz/component-builder>
@copyright Copyright (C) 2015. All Rights Reserved
@license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
Builds Complex Joomla Components
/-----------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
// import the list field type
jimport('joomla.form.helper');
JFormHelper::loadFieldClass('list');
/**
* Ftps Form Field class for the Componentbuilder component
*/
class JFormFieldFtps extends JFormFieldList
{
/**
* The ftps field type.
*
* @var string
*/
public $type = 'ftps';
/**
* Override to add new button
*
* @return string The field input markup.
*
* @since 3.2
*/
protected function getInput()
{
// see if we should add buttons
$setButton = $this->getAttribute('button');
// get html
$html = parent::getInput();
// if true set button
if ($setButton === 'true')
{
$button = array();
$script = array();
$buttonName = $this->getAttribute('name');
// get the input from url
$app = JFactory::getApplication();
$jinput = $app->input;
// get the view name & id
$values = $jinput->getArray(array(
'id' => 'int',
'view' => 'word'
));
// check if new item
$ref = '';
$refJ = '';
if (!is_null($values['id']) && strlen($values['view']))
{
// only load referal if not new item.
$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
}
$user = JFactory::getUser();
// only add if user allowed to create ftp
if ($user->authorise('ftp.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
{
// build Create button
$buttonNamee = trim($buttonName);
$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
$buttonNamee = ucfirst(strtolower($buttonNamee));
$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
href="index.php?option=com_componentbuilder&amp;view=ftp&amp;layout=edit'.$ref.'" >
<span class="icon-new icon-white"></span></a>';
}
// only add if user allowed to edit ftp
if (($buttonName === 'ftp' || $buttonName === 'ftps') && $user->authorise('ftp.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
{
// build edit button
$buttonNamee = trim($buttonName);
$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
$buttonNamee = ucfirst(strtolower($buttonNamee));
$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
<span class="icon-edit"></span></a>';
// build script
$script[] = "
jQuery(document).ready(function() {
jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
e.preventDefault();
var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
".$buttonName."Button(".$buttonName."Value);
});
var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
".$buttonName."Button(".$buttonName."Value);
});
function ".$buttonName."Button(value) {
if (value > 0) {
// hide the create button
jQuery('#".$buttonName."Create').hide();
// show edit button
jQuery('#".$buttonName."Edit').show();
var url = 'index.php?option=com_componentbuilder&view=ftps&task=ftp.edit&id='+value+'".$refJ."';
jQuery('#".$buttonName."Edit').attr('href', url);
} else {
// show the create button
jQuery('#".$buttonName."Create').show();
// hide edit button
jQuery('#".$buttonName."Edit').hide();
}
}";
}
// check if button was created for ftp field.
if (is_array($button) && count($button) > 0)
{
// Load the needed script.
$document = JFactory::getDocument();
$document->addScriptDeclaration(implode(' ',$script));
// return the button attached to input field.
return '<div class="input-append">' .$html . implode('',$button).'</div>';
}
}
return $html;
}
/**
* Method to get a list of options for a list input.
*
* @return array An array of JHtml options.
*/
public function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.name'),array('id','sales_server_ftp_name')));
$query->from($db->quoteName('#__componentbuilder_ftp', 'a'));
$query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.name ASC');
$db->setQuery((string)$query);
$items = $db->loadObjectList();
$options = array();
if ($items)
{
$options[] = JHtml::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = JHtml::_('select.option', $item->id, $item->sales_server_ftp_name);
}
}
return $options;
}
}

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

File diff suppressed because it is too large Load Diff

2
admin/models/help_documents.php
View File

@ -266,7 +266,7 @@ class ComponentbuilderModelHelp_documents extends JModelList
else
{
$search = $db->quote('%' . $db->escape($search) . '%');
$query->where('(a.title LIKE '.$search.' OR a.type LIKE '.$search.' OR a.location LIKE '.$search.' OR a.admin_view LIKE '.$search.' OR g. LIKE '.$search.' OR a.site_view LIKE '.$search.' OR h. LIKE '.$search.')');
$query->where('(a.title LIKE '.$search.' OR a.type LIKE '.$search.' OR a.location LIKE '.$search.' OR a.admin_view LIKE '.$search.' OR a.site_view LIKE '.$search.')');
}
}

84
admin/models/joomla_component.php
View File

@ -108,22 +108,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$item->addcontributors = $addcontributors->toArray();
}
if (!empty($item->php_preflight_update))
if (!empty($item->php_postflight_install))
{
// base64 Decode php_preflight_update.
$item->php_preflight_update = base64_decode($item->php_preflight_update);
// base64 Decode php_postflight_install.
$item->php_postflight_install = base64_decode($item->php_postflight_install);
}
if (!empty($item->sql))
if (!empty($item->readme))
{
// base64 Decode sql.
$item->sql = base64_decode($item->sql);
}
if (!empty($item->php_postflight_update))
{
// base64 Decode php_postflight_update.
$item->php_postflight_update = base64_decode($item->php_postflight_update);
// base64 Decode readme.
$item->readme = base64_decode($item->readme);
}
if (!empty($item->php_preflight_install))
@ -132,22 +126,28 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$item->php_preflight_install = base64_decode($item->php_preflight_install);
}
if (!empty($item->php_postflight_install))
{
// base64 Decode php_postflight_install.
$item->php_postflight_install = base64_decode($item->php_postflight_install);
}
if (!empty($item->php_method_uninstall))
{
// base64 Decode php_method_uninstall.
$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
}
if (!empty($item->readme))
if (!empty($item->php_preflight_update))
{
// base64 Decode readme.
$item->readme = base64_decode($item->readme);
// base64 Decode php_preflight_update.
$item->php_preflight_update = base64_decode($item->php_preflight_update);
}
if (!empty($item->php_postflight_update))
{
// base64 Decode php_postflight_update.
$item->php_postflight_update = base64_decode($item->php_postflight_update);
}
if (!empty($item->sql))
{
// base64 Decode sql.
$item->sql = base64_decode($item->sql);
}
if (!empty($item->php_helper_both))
@ -1196,22 +1196,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$data['addcontributors'] = '';
}
// Set the php_preflight_update string to base64 string.
if (isset($data['php_preflight_update']))
// Set the php_postflight_install string to base64 string.
if (isset($data['php_postflight_install']))
{
$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
}
// Set the sql string to base64 string.
if (isset($data['sql']))
// Set the readme string to base64 string.
if (isset($data['readme']))
{
$data['sql'] = base64_encode($data['sql']);
}
// Set the php_postflight_update string to base64 string.
if (isset($data['php_postflight_update']))
{
$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
$data['readme'] = base64_encode($data['readme']);
}
// Set the php_preflight_install string to base64 string.
@ -1220,22 +1214,28 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
}
// Set the php_postflight_install string to base64 string.
if (isset($data['php_postflight_install']))
{
$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
}
// Set the php_method_uninstall string to base64 string.
if (isset($data['php_method_uninstall']))
{
$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
}
// Set the readme string to base64 string.
if (isset($data['readme']))
// Set the php_preflight_update string to base64 string.
if (isset($data['php_preflight_update']))
{
$data['readme'] = base64_encode($data['readme']);
$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
}
// Set the php_postflight_update string to base64 string.
if (isset($data['php_postflight_update']))
{
$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
}
// Set the sql string to base64 string.
if (isset($data['sql']))
{
$data['sql'] = base64_encode($data['sql']);
}
// Set the php_helper_both string to base64 string.

28
admin/models/joomla_components.php
View File

@ -1494,25 +1494,25 @@ class ComponentbuilderModelJoomla_components extends JModelList
continue;
}
// decode php_preflight_update
$item->php_preflight_update = base64_decode($item->php_preflight_update);
// decode sql
$item->sql = base64_decode($item->sql);
// decode php_postflight_update
$item->php_postflight_update = base64_decode($item->php_postflight_update);
// decode php_postflight_install
$item->php_postflight_install = base64_decode($item->php_postflight_install);
// decode readme
$item->readme = base64_decode($item->readme);
// decode php_preflight_install
$item->php_preflight_install = base64_decode($item->php_preflight_install);
// decode php_method_uninstall
$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
{
// decrypt whmcs_key
$item->whmcs_key = $basic->decryptString($item->whmcs_key);
}
// decode php_preflight_install
$item->php_preflight_install = base64_decode($item->php_preflight_install);
// decode php_postflight_install
$item->php_postflight_install = base64_decode($item->php_postflight_install);
// decode php_method_uninstall
$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
// decode readme
$item->readme = base64_decode($item->readme);
// decode php_preflight_update
$item->php_preflight_update = base64_decode($item->php_preflight_update);
// decode php_postflight_update
$item->php_postflight_update = base64_decode($item->php_postflight_update);
// decode sql
$item->sql = base64_decode($item->sql);
// decode php_helper_both
$item->php_helper_both = base64_decode($item->php_helper_both);
// decode php_helper_admin

2
admin/models/layouts.php
View File

@ -195,7 +195,7 @@ class ComponentbuilderModelLayouts extends JModelList
else
{
$search = $db->quote('%' . $db->escape($search) . '%');
$query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.' OR a.description LIKE '.$search.' OR a.dynamic_get LIKE '.$search.' OR g.name LIKE '.$search.')');
$query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.' OR a.description LIKE '.$search.' OR a.dynamic_get LIKE '.$search.')');
}
}

28
admin/sql/install.mysql.utf8.sql
View File

@ -93,25 +93,24 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
KEY `idx_state` (`published`),
KEY `idx_system_name` (`system_name`),
KEY `idx_name_code` (`name_code`),
KEY `idx_add_placeholders` (`add_placeholders`),
KEY `idx_add_javascript` (`add_javascript`),
KEY `idx_debug_linenr` (`debug_linenr`),
KEY `idx_mvc_versiondate` (`mvc_versiondate`),
KEY `idx_addfootable` (`addfootable`),
KEY `idx_add_php_helper_admin` (`add_php_helper_admin`),
KEY `idx_add_update_server` (`add_update_server`),
KEY `idx_add_php_helper_site` (`add_php_helper_site`),
KEY `idx_creatuserhelper` (`creatuserhelper`),
KEY `idx_add_php_helper_both` (`add_php_helper_both`),
KEY `idx_add_license` (`add_license`),
KEY `idx_add_admin_event` (`add_admin_event`),
KEY `idx_license_type` (`license_type`),
KEY `idx_add_site_event` (`add_site_event`),
KEY `idx_add_css` (`add_css`),
KEY `idx_add_admin_event` (`add_admin_event`),
KEY `idx_add_placeholders` (`add_placeholders`),
KEY `idx_add_php_helper_both` (`add_php_helper_both`),
KEY `idx_add_site_event` (`add_site_event`),
KEY `idx_debug_linenr` (`debug_linenr`),
KEY `idx_creatuserhelper` (`creatuserhelper`),
KEY `idx_update_server_target` (`update_server_target`),
KEY `idx_add_license` (`add_license`),
KEY `idx_addfootable` (`addfootable`),
KEY `idx_license_type` (`license_type`),
KEY `idx_add_php_helper_admin` (`add_php_helper_admin`),
KEY `idx_add_php_helper_site` (`add_php_helper_site`),
KEY `idx_add_javascript` (`add_javascript`),
KEY `idx_add_update_server` (`add_update_server`),
KEY `idx_adduikit` (`adduikit`),
KEY `idx_add_email_helper` (`add_email_helper`),
KEY `idx_emptycontributors` (`emptycontributors`),
KEY `idx_add_php_preflight_install` (`add_php_preflight_install`),
KEY `idx_add_php_preflight_update` (`add_php_preflight_update`),
KEY `idx_add_php_postflight_install` (`add_php_postflight_install`),
@ -119,6 +118,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`),
KEY `idx_add_sql` (`add_sql`),
KEY `idx_addreadme` (`addreadme`),
KEY `idx_emptycontributors` (`emptycontributors`),
KEY `idx_add_sales_server` (`add_sales_server`)
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;

8
script.php
View File

@ -2862,9 +2862,9 @@ class com_componentbuilderInstallerScript
$joomla_component->type_title = 'Componentbuilder Joomla_component';
$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","add_placeholders":"add_placeholders","php_preflight_update":"php_preflight_update","description":"description","add_javascript":"add_javascript","copyright":"copyright","sql":"sql","debug_linenr":"debug_linenr","mvc_versiondate":"mvc_versiondate","name":"name","addfootable":"addfootable","php_postflight_update":"php_postflight_update","add_php_helper_admin":"add_php_helper_admin","add_update_server":"add_update_server","add_php_helper_site":"add_php_helper_site","sales_server_ftp":"sales_server_ftp","email":"email","creatuserhelper":"creatuserhelper","website":"website","add_php_helper_both":"add_php_helper_both","add_license":"add_license","add_admin_event":"add_admin_event","license_type":"license_type","add_site_event":"add_site_event","add_css":"add_css","whmcs_key":"whmcs_key","php_preflight_install":"php_preflight_install","whmcs_url":"whmcs_url","php_postflight_install":"php_postflight_install","license":"license","php_method_uninstall":"php_method_uninstall","bom":"bom","readme":"readme","image":"image","update_server_target":"update_server_target","not_required":"not_required","update_server_ftp":"update_server_ftp","buildcomp":"buildcomp","adduikit":"adduikit","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","javascript":"javascript","emptycontributors":"emptycontributors","css":"css","number":"number","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","toignore":"toignore","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","addreadme":"addreadme","export_key":"export_key","export_package_link":"export_package_link","update_server":"update_server","export_buy_link":"export_buy_link","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql"}}';
$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","mvc_versiondate":"mvc_versiondate","add_css":"add_css","description":"description","add_admin_event":"add_admin_event","copyright":"copyright","php_postflight_install":"php_postflight_install","add_placeholders":"add_placeholders","add_php_helper_both":"add_php_helper_both","readme":"readme","add_site_event":"add_site_event","debug_linenr":"debug_linenr","php_preflight_install":"php_preflight_install","creatuserhelper":"creatuserhelper","php_method_uninstall":"php_method_uninstall","email":"email","update_server_target":"update_server_target","website":"website","add_license":"add_license","addfootable":"addfootable","license_type":"license_type","add_php_helper_admin":"add_php_helper_admin","add_php_helper_site":"add_php_helper_site","whmcs_key":"whmcs_key","add_javascript":"add_javascript","whmcs_url":"whmcs_url","license":"license","php_preflight_update":"php_preflight_update","bom":"bom","php_postflight_update":"php_postflight_update","image":"image","sql":"sql","update_server_ftp":"update_server_ftp","add_update_server":"add_update_server","buildcomp":"buildcomp","not_required":"not_required","sales_server_ftp":"sales_server_ftp","name":"name","adduikit":"adduikit","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","javascript":"javascript","toignore":"toignore","css":"css","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","export_key":"export_key","add_php_postflight_install":"add_php_postflight_install","export_package_link":"export_package_link","add_php_postflight_update":"add_php_postflight_update","export_buy_link":"export_buy_link","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","addreadme":"addreadme","emptycontributors":"emptycontributors","update_server":"update_server","number":"number","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql"}}';
$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_placeholders","add_javascript","debug_linenr","mvc_versiondate","addfootable","add_php_helper_admin","add_update_server","add_php_helper_site","sales_server_ftp","creatuserhelper","add_php_helper_both","add_license","add_admin_event","license_type","add_site_event","add_css","update_server_target","not_required","update_server_ftp","buildcomp","adduikit","add_email_helper","emptycontributors","number","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","addreadme","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"}]}';
$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","mvc_versiondate","add_css","add_admin_event","add_placeholders","add_php_helper_both","add_site_event","debug_linenr","creatuserhelper","update_server_target","add_license","addfootable","license_type","add_php_helper_admin","add_php_helper_site","add_javascript","update_server_ftp","add_update_server","buildcomp","not_required","sales_server_ftp","adduikit","add_email_helper","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","addreadme","emptycontributors","number","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"}]}';
// Set the object into the content types table.
$joomla_component_Inserted = $db->insertObject('#__content_types', $joomla_component);
@ -3224,9 +3224,9 @@ class com_componentbuilderInstallerScript
$joomla_component->type_title = 'Componentbuilder Joomla_component';
$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","add_placeholders":"add_placeholders","php_preflight_update":"php_preflight_update","description":"description","add_javascript":"add_javascript","copyright":"copyright","sql":"sql","debug_linenr":"debug_linenr","mvc_versiondate":"mvc_versiondate","name":"name","addfootable":"addfootable","php_postflight_update":"php_postflight_update","add_php_helper_admin":"add_php_helper_admin","add_update_server":"add_update_server","add_php_helper_site":"add_php_helper_site","sales_server_ftp":"sales_server_ftp","email":"email","creatuserhelper":"creatuserhelper","website":"website","add_php_helper_both":"add_php_helper_both","add_license":"add_license","add_admin_event":"add_admin_event","license_type":"license_type","add_site_event":"add_site_event","add_css":"add_css","whmcs_key":"whmcs_key","php_preflight_install":"php_preflight_install","whmcs_url":"whmcs_url","php_postflight_install":"php_postflight_install","license":"license","php_method_uninstall":"php_method_uninstall","bom":"bom","readme":"readme","image":"image","update_server_target":"update_server_target","not_required":"not_required","update_server_ftp":"update_server_ftp","buildcomp":"buildcomp","adduikit":"adduikit","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","javascript":"javascript","emptycontributors":"emptycontributors","css":"css","number":"number","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","toignore":"toignore","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","addreadme":"addreadme","export_key":"export_key","export_package_link":"export_package_link","update_server":"update_server","export_buy_link":"export_buy_link","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql"}}';
$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","mvc_versiondate":"mvc_versiondate","add_css":"add_css","description":"description","add_admin_event":"add_admin_event","copyright":"copyright","php_postflight_install":"php_postflight_install","add_placeholders":"add_placeholders","add_php_helper_both":"add_php_helper_both","readme":"readme","add_site_event":"add_site_event","debug_linenr":"debug_linenr","php_preflight_install":"php_preflight_install","creatuserhelper":"creatuserhelper","php_method_uninstall":"php_method_uninstall","email":"email","update_server_target":"update_server_target","website":"website","add_license":"add_license","addfootable":"addfootable","license_type":"license_type","add_php_helper_admin":"add_php_helper_admin","add_php_helper_site":"add_php_helper_site","whmcs_key":"whmcs_key","add_javascript":"add_javascript","whmcs_url":"whmcs_url","license":"license","php_preflight_update":"php_preflight_update","bom":"bom","php_postflight_update":"php_postflight_update","image":"image","sql":"sql","update_server_ftp":"update_server_ftp","add_update_server":"add_update_server","buildcomp":"buildcomp","not_required":"not_required","sales_server_ftp":"sales_server_ftp","name":"name","adduikit":"adduikit","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","javascript":"javascript","toignore":"toignore","css":"css","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","export_key":"export_key","add_php_postflight_install":"add_php_postflight_install","export_package_link":"export_package_link","add_php_postflight_update":"add_php_postflight_update","export_buy_link":"export_buy_link","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","addreadme":"addreadme","emptycontributors":"emptycontributors","update_server":"update_server","number":"number","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql"}}';
$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_placeholders","add_javascript","debug_linenr","mvc_versiondate","addfootable","add_php_helper_admin","add_update_server","add_php_helper_site","sales_server_ftp","creatuserhelper","add_php_helper_both","add_license","add_admin_event","license_type","add_site_event","add_css","update_server_target","not_required","update_server_ftp","buildcomp","adduikit","add_email_helper","emptycontributors","number","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","addreadme","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"}]}';
$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","mvc_versiondate","add_css","add_admin_event","add_placeholders","add_php_helper_both","add_site_event","debug_linenr","creatuserhelper","update_server_target","add_license","addfootable","license_type","add_php_helper_admin","add_php_helper_site","add_javascript","update_server_ftp","add_update_server","buildcomp","not_required","sales_server_ftp","adduikit","add_email_helper","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","addreadme","emptycontributors","number","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server_ftp","targetTable": "#__componentbuilder_ftp","targetColumn": "id","displayColumn": "name"}]}';
// Check if joomla_component type is already in content_type DB.
$joomla_component_id = null;