_t(2)
- . 'addrulepath="/modules/' . $module->file_name
- . '/rules"';
- $xml .= PHP_EOL . $this->_t(2)
- . 'addfieldpath="/modules/' . $module->file_name
- . '/fields"';
+ if ($module->target == 2)
+ {
+ $xml .= PHP_EOL . $this->_t(2)
+ . 'addrulepath="/administrator/modules/' . $module->file_name
+ . '/rules"';
+ $xml .= PHP_EOL . $this->_t(2)
+ . 'addfieldpath="/administrator/modules/' . $module->file_name
+ . '/fields"';
+ }
+ else
+ {
+ $xml .= PHP_EOL . $this->_t(2)
+ . 'addrulepath="/modules/' . $module->file_name
+ . '/rules"';
+ $xml .= PHP_EOL . $this->_t(2)
+ . 'addfieldpath="/modules/' . $module->file_name
+ . '/fields"';
+ }
$xml .= PHP_EOL . $this->_t(1) . '>';
}
else
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 6e2e3ca9d..fa2ea1d98 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -1077,6 +1077,9 @@ class Infusion extends Interpretation
);
}
+ // setup the layouts
+ $this->setCustomViewLayouts();
+
// ADMIN_HELPER_CLASS_HEADER
$this->fileContentStatic[$this->hhh . 'ADMIN_HELPER_CLASS_HEADER'
. $this->hhh]
@@ -1760,6 +1763,7 @@ class Infusion extends Interpretation
&$this->placeholders, &$this->hhh)
);
}
+
// setup the layouts
$this->setCustomViewLayouts();
}
@@ -1930,7 +1934,7 @@ class Infusion extends Interpretation
// Trigger Event: jcb_ce_onBeforeInfuseModuleData
$this->triggerEvent(
'jcb_ce_onBeforeInfuseModuleData',
- array(&$this->componentContext, &$module, $this)
+ array(&$this->componentContext, &$module, &$this)
);
$this->target = $module->key;
$this->lang = $module->key;
@@ -1994,7 +1998,7 @@ class Infusion extends Interpretation
// Trigger Event: jcb_ce_onAfterInfuseModuleData
$this->triggerEvent(
'jcb_ce_onAfterInfuseModuleData',
- array(&$this->componentContext, &$module, $this)
+ array(&$this->componentContext, &$module, &$this)
);
}
}
@@ -2009,7 +2013,7 @@ class Infusion extends Interpretation
// Trigger Event: jcb_ce_onBeforeInfusePluginData
$this->triggerEvent(
'jcb_ce_onBeforeInfusePluginData',
- array(&$this->componentContext, &$plugin, $this)
+ array(&$this->componentContext, &$plugin, &$this)
);
$this->target = $plugin->key;
$this->lang = $plugin->key;
@@ -2056,7 +2060,7 @@ class Infusion extends Interpretation
// Trigger Event: jcb_ce_onAfterInfusePluginData
$this->triggerEvent(
'jcb_ce_onAfterInfusePluginData',
- array(&$this->componentContext, &$plugin, $this)
+ array(&$this->componentContext, &$plugin, &$this)
);
}
}
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index cf7d9cd02..c4d29f654 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -13,6 +13,7 @@
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Language\Language;
+use Joomla\Registry\Registry;
use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -56,7 +57,7 @@ abstract class ComponentbuilderHelper
/**
* Array of php fields Allowed (16)
**/
- public static $phpFieldArray = array('', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'x');
+ public static $phpFieldArray = array('', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'x', 'HEADER');
/**
* The global params
@@ -2964,7 +2965,15 @@ abstract class ComponentbuilderHelper
$script['setdata'][] = self::_t(3) . "\$jinput = JFactory::getApplication()->input;";
$script['setdata'][] = self::_t(3) . "foreach(\$target_headers as \$header)";
$script['setdata'][] = self::_t(3) . "{";
- $script['setdata'][] = self::_t(4) . "\$data['target_headers'][\$header] = \$jinput->getString(\$header, null);";
+ $script['setdata'][] = self::_t(4) . "if ((\$column = \$jinput->getString(\$header, false)) !== false ||";
+ $script['setdata'][] = self::_t(5) . "(\$column = \$jinput->getString(strtolower(\$header), false)) !== false)";
+ $script['setdata'][] = self::_t(4) . "{";
+ $script['setdata'][] = self::_t(5) . "\$data['target_headers'][\$header] = \$column;";
+ $script['setdata'][] = self::_t(4) . "}";
+ $script['setdata'][] = self::_t(4) . "else";
+ $script['setdata'][] = self::_t(4) . "{";
+ $script['setdata'][] = self::_t(5) . "\$data['target_headers'][\$header] = null;";
+ $script['setdata'][] = self::_t(4) . "}";
$script['setdata'][] = self::_t(3) . "}";
$script['setdata'][] = self::_t(3) . "// set the data";
$script['setdata'][] = self::_t(3) . "if(isset(\$package['dir']))";
@@ -5534,14 +5543,61 @@ abstract class ComponentbuilderHelper
*
*/
public static function getEditURL(&$item, $view, $views, $ref = '', $component = 'com_componentbuilder', $jRoute = true)
+ {
+ // build record
+ $record = new stdClass();
+ // check if user can edit
+ if (self::canEditItem($record, $item, $view, $views, $component))
+ {
+ // set the edit link
+ if ($jRoute)
+ {
+ return JRoute::_("index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref);
+ }
+ return "index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref;
+ }
+ return false;
+ }
+
+ /**
+ * Can Edit (either any, or own)
+ *
+ * @param int $item The item to edit
+ * @param string $view The type of item to edit
+ * @param string $views The list view controller name
+ * @param string $component The component these views belong to
+ *
+ * @return bool if user can edit returns true els
+ *
+ */
+ public static function allowEdit(&$item, $view, $views, $component = 'com_componentbuilder')
+ {
+ // build record
+ $record = new stdClass();
+ return self::canEditItem($record, $item, $view, $views, $component);
+ }
+
+
+ /**
+ * Can Edit (either any, or own)
+ *
+ * @param int $item The item to edit
+ * @param string $view The type of item to edit
+ * @param string $views The list view controller name
+ * @param string $component The component these views belong to
+ *
+ * @return bool if user can edit returns true els
+ *
+ */
+ protected static function canEditItem(&$record, &$item, $view, $views, $component = 'com_componentbuilder')
{
// make sure the user has access to view
if (!JFactory::getUser()->authorise($view. '.access', $component))
{
return false;
}
- // build record
- $record = new stdClass();
+ // we start with false.
+ $can_edit = false;
// check that we have the ID
if (self::checkObject($item) && isset($item->id))
{
@@ -5571,25 +5627,14 @@ abstract class ComponentbuilderHelper
// get user action permission to edit
$action = self::getActions($view, $record, $views, 'edit', str_replace('com_', '', $component));
// check if the view permission is set
- if (($edit = $action->get($view . '.edit', 'none-set')) === 'none-set')
+ if (($can_edit = $action->get($view . '.edit', 'none-set')) === 'none-set')
{
- // fall back on the core permission then
- $edit = $action->get('core.edit', 'none-set');
- }
- // can edit
- if ($edit)
- {
- // set the edit link
- if ($jRoute)
- {
- return JRoute::_("index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref);
- }
- return "index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref;
+ // fall back on the core permission then (this can be an issue)
+ $can_edit = ($action->get('core.edit', false) || $action->get('core.edit.own', false));
}
}
- return false;
+ return $can_edit;
}
-
/**
* set subform type table
@@ -5632,9 +5677,9 @@ abstract class ComponentbuilderHelper
/**
* Change to nice fancy date
*/
- public static function fancyDate($date)
+ public static function fancyDate($date, $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5644,9 +5689,9 @@ abstract class ComponentbuilderHelper
/**
* get date based in period past
*/
- public static function fancyDynamicDate($date)
+ public static function fancyDynamicDate($date, $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5670,9 +5715,9 @@ abstract class ComponentbuilderHelper
/**
* Change to nice fancy day time and date
*/
- public static function fancyDayTimeDate($time)
+ public static function fancyDayTimeDate($time, $check_stamp = true)
{
- if (!self::isValidTimeStamp($time))
+ if ($check_stamp && !self::isValidTimeStamp($time))
{
$time = strtotime($time);
}
@@ -5682,9 +5727,9 @@ abstract class ComponentbuilderHelper
/**
* Change to nice fancy time and date
*/
- public static function fancyDateTime($time)
+ public static function fancyDateTime($time, $check_stamp = true)
{
- if (!self::isValidTimeStamp($time))
+ if ($check_stamp && !self::isValidTimeStamp($time))
{
$time = strtotime($time);
}
@@ -5694,9 +5739,9 @@ abstract class ComponentbuilderHelper
/**
* Change to nice hour:minutes time
*/
- public static function fancyTime($time)
+ public static function fancyTime($time, $check_stamp = true)
{
- if (!self::isValidTimeStamp($time))
+ if ($check_stamp && !self::isValidTimeStamp($time))
{
$time = strtotime($time);
}
@@ -5706,9 +5751,9 @@ abstract class ComponentbuilderHelper
/**
* set the date day as Sunday through Saturday
*/
- public static function setDayName($date)
+ public static function setDayName($date, $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5718,9 +5763,9 @@ abstract class ComponentbuilderHelper
/**
* set the date month as January through December
*/
- public static function setMonthName($date)
+ public static function setMonthName($date, $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5730,9 +5775,9 @@ abstract class ComponentbuilderHelper
/**
* set the date day as 1st
*/
- public static function setDay($date)
+ public static function setDay($date, $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5742,9 +5787,9 @@ abstract class ComponentbuilderHelper
/**
* set the date month as 5
*/
- public static function setMonth($date)
+ public static function setMonth($date, $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5754,9 +5799,9 @@ abstract class ComponentbuilderHelper
/**
* set the date year as 2004 (for charts)
*/
- public static function setYear($date)
+ public static function setYear($date, $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5766,9 +5811,9 @@ abstract class ComponentbuilderHelper
/**
* set the date as 2004/05 (for charts)
*/
- public static function setYearMonth($date, $spacer = '/')
+ public static function setYearMonth($date, $spacer = '/', $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
@@ -5778,15 +5823,27 @@ abstract class ComponentbuilderHelper
/**
* set the date as 2004/05/03 (for charts)
*/
- public static function setYearMonthDay($date, $spacer = '/')
+ public static function setYearMonthDay($date, $spacer = '/', $check_stamp = true)
{
- if (!self::isValidTimeStamp($date))
+ if ($check_stamp && !self::isValidTimeStamp($date))
{
$date = strtotime($date);
}
return date('Y' . $spacer . 'm' . $spacer . 'd', $date);
}
+ /**
+ * set the date as 03/05/2004
+ */
+ public static function setDayMonthYear($date, $spacer = '/', $check_stamp = true)
+ {
+ if ($check_stamp && !self::isValidTimeStamp($date))
+ {
+ $date = strtotime($date);
+ }
+ return date('d' . $spacer . 'm' . $spacer . 'Y', $date);
+ }
+
/**
* Check if string is a valid time stamp
*/
@@ -5797,6 +5854,57 @@ abstract class ComponentbuilderHelper
&& ($timestamp >= ~PHP_INT_MAX);
}
+ /**
+ * Check if string is a valid date
+ * https://www.php.net/manual/en/function.checkdate.php#113205
+ */
+ public static function isValidateDate($date, $format = 'Y-m-d H:i:s')
+ {
+ $d = DateTime::createFromFormat($format, $date);
+ return $d && $d->format($format) == $date;
+ }
+
+
+ /**
+ * The subform layouts
+ **/
+ protected static $subformLayouts = false;
+
+ /**
+ * get the subform layout
+ *
+ * @input string The view name
+ * @input string The string name
+ *
+ * @returns string on success
+ **/
+ public static function getSubformLayout($view, $field, $default = 'repeatablejcb')
+ {
+ // get global values
+ if (self::$subformLayouts === false)
+ {
+ self::$subformLayouts = JComponentHelper::getParams('com_componentbuilder')->get('subform_layouts', false);
+ }
+ // check what we found (else) return default
+ if (self::checkObject(self::$subformLayouts))
+ {
+ // looking for
+ $target = $view . '.' . $field;
+ foreach (self::$subformLayouts as $subform)
+ {
+ if ($target === $subform->view_field)
+ {
+ return $subform->layout;
+ }
+ elseif ('default' === $subform->view_field)
+ {
+ $default = $subform->layout;
+ }
+ }
+ }
+ return $default;
+ }
+
/**
* Load the Composer Vendors
@@ -6033,12 +6141,12 @@ abstract class ComponentbuilderHelper
if ($user->authorise('field.access', 'com_componentbuilder') && $user->authorise('field.submenu', 'com_componentbuilder'))
{
JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_FIELDS'), 'index.php?option=com_componentbuilder&view=fields', $submenu === 'fields');
- JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_FIELD_FIELDS_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.fields', $submenu === 'categories.fields');
+ JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_FIELD_FIELDS_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.field', $submenu === 'categories.field');
}
if ($user->authorise('fieldtype.access', 'com_componentbuilder') && $user->authorise('fieldtype.submenu', 'com_componentbuilder'))
{
JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES'), 'index.php?option=com_componentbuilder&view=fieldtypes', $submenu === 'fieldtypes');
- JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPES_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.fieldtypes', $submenu === 'categories.fieldtypes');
+ JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPES_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.fieldtype', $submenu === 'categories.fieldtype');
}
if ($user->authorise('language_translation.access', 'com_componentbuilder') && $user->authorise('language_translation.submenu', 'com_componentbuilder'))
{
@@ -6201,6 +6309,8 @@ abstract class ComponentbuilderHelper
->setLastModifiedBy($modified)
->setTitle($title)
->setSubject($subjectTab);
+ // The file type
+ $file_type = 'Xls';
// set description
if ($description)
{
@@ -6240,21 +6350,46 @@ abstract class ComponentbuilderHelper
));
// Add some data
- if (self::checkArray($rows))
+ if (($size = self::checkArray($rows)) !== false)
{
$i = 1;
- foreach ($rows as $array){
+
+ // Based on data size we adapt the behaviour.
+ $xls_mode = 1;
+ if ($size > 3000)
+ {
+ $xls_mode = 3;
+ $file_type = 'Csv';
+ }
+ elseif ($size > 2000)
+ {
+ $xls_mode = 2;
+ }
+
+ // Set active sheet and get it.
+ $active_sheet = $spreadsheet->setActiveSheetIndex(0);
+ foreach ($rows as $array)
+ {
$a = 'A';
- foreach ($array as $value){
- $spreadsheet->setActiveSheetIndex(0)->setCellValue($a.$i, $value);
- if ($i == 1){
- $spreadsheet->getActiveSheet()->getColumnDimension($a)->setAutoSize(true);
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($headerStyles);
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
- } elseif ($a === 'A'){
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($sideStyles);
- } else {
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($normalStyles);
+ foreach ($array as $value)
+ {
+ $active_sheet->setCellValue($a.$i, $value);
+ if ($xls_mode != 3)
+ {
+ if ($i == 1)
+ {
+ $active_sheet->getColumnDimension($a)->setAutoSize(true);
+ $active_sheet->getStyle($a.$i)->applyFromArray($headerStyles);
+ $active_sheet->getStyle($a.$i)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+ }
+ elseif ($a === 'A')
+ {
+ $active_sheet->getStyle($a.$i)->applyFromArray($sideStyles);
+ }
+ elseif ($xls_mode == 1)
+ {
+ $active_sheet->getStyle($a.$i)->applyFromArray($normalStyles);
+ }
}
$a++;
}
@@ -6274,7 +6409,7 @@ abstract class ComponentbuilderHelper
// Redirect output to a client's web browser (Excel5)
header('Content-Type: application/vnd.ms-excel');
- header('Content-Disposition: attachment;filename="'.$fileName.'.xls"');
+ header('Content-Disposition: attachment;filename="' . $fileName . '.' . strtolower($file_type) .'"');
header('Cache-Control: max-age=0');
// If you're serving to IE 9, then the following may be needed
header('Cache-Control: max-age=1');
@@ -6285,7 +6420,7 @@ abstract class ComponentbuilderHelper
header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
header ('Pragma: public'); // HTTP/1.0
- $writer = IOFactory::createWriter($spreadsheet, 'Xls');
+ $writer = IOFactory::createWriter($spreadsheet, $file_type);
$writer->save('php://output');
jexit();
}
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index de38067e9..cb148d833 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -7,6 +7,7 @@ COM_COMPONENTBUILDER_ACCESS="Access"
COM_COMPONENTBUILDER_ACCESS_BULK_TOOLS="Access Bulk Tools"
COM_COMPONENTBUILDER_ACCESS_DENIED="Access denied!"
COM_COMPONENTBUILDER_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_field)"
+COM_COMPONENTBUILDER_ADD="Add"
COM_COMPONENTBUILDER_ADD_ACCESS="Add Access"
COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB_OR_EVEN_FOR_YOUR_OWN_DEBUGGING="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github, or even for your own debugging."
COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders"
@@ -3234,6 +3235,10 @@ COM_COMPONENTBUILDER_CONDITIONS="Conditions"
COM_COMPONENTBUILDER_CONFIG_ACTIVE="Active"
COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_DESCRIPTION="Would you like to add a prefix to the Joomla menu name of your components"
COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_LABEL="Add Menu Prefix"
+COM_COMPONENTBUILDER_CONFIG_ADMIN_CUSTOM_TABS_TABS="Admin Custom Tabs (tabs)"
+COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_ADDFIELDS="Admin Fields (addfields)"
+COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS="Admin Fields Conditions (addconditions)"
+COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_RELATIONS_ADDRELATIONS="Admin Fields Relations (addrelations)"
COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC="Alphanumeric"
COM_COMPONENTBUILDER_CONFIG_ALPHANUMERICDOT="Alphanumeric+dot"
@@ -3335,7 +3340,10 @@ COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_MESSAGE="Error! Please add some
COM_COMPONENTBUILDER_CONFIG_COMPILER_PLUGIN_DESCRIPTION="Select the plugin you would like to use in JCB's compiler"
COM_COMPONENTBUILDER_CONFIG_COMPILER_PLUGIN_LABEL="Activate Compiler Plugins"
COM_COMPONENTBUILDER_CONFIG_COMPONENT="Component"
+COM_COMPONENTBUILDER_CONFIG_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS="Component Admin Views (addadmin_views)"
+COM_COMPONENTBUILDER_CONFIG_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS="Component Custom Admin Views (addcustom_admin_views)"
COM_COMPONENTBUILDER_CONFIG_COMPONENT_LABEL="Component"
+COM_COMPONENTBUILDER_CONFIG_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS="Component Site Views (addsite_views)"
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION="Here you can set the path to where all components are backed up to."
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_HINT="/home/user/fullbackup"
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL="Cronjob Backup Folder Path"
@@ -3378,6 +3386,8 @@ COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_DESCRIPTION="This is the TXT value to use
COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_HINT="v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY"
COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_LABEL="Value"
COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not"
+COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_DB_TABLE="Dynamic Get (join_db_table)"
+COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_VIEW_TABLE="Dynamic Get (join_view_table)"
COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION="Select the editor you would like to use as the JCB global editor for all custom coding areas."
COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL="Select an editor"
COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION="The global email address that will be used to send system email."
@@ -3446,6 +3456,8 @@ COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_DESCRIPTION="Enter Email"
COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_HINT="Email Here"
COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_LABEL="Email"
COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_MESSAGE="Error! Please email address here."
+COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_DESCRIPTION="All the export of language strings during JCB package export."
+COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_LABEL="Export Language Strings"
COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_DESCRIPTION="Add License Here"
COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_HINT="Add License Here"
COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_LABEL="License"
@@ -3485,6 +3497,7 @@ COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES="JCB Community Packages"
COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area."
COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL="Directories"
COM_COMPONENTBUILDER_CONFIG_LANGUAGE_LABEL="Language"
+COM_COMPONENTBUILDER_CONFIG_LAYOUT_LABEL="Layout"
COM_COMPONENTBUILDER_CONFIG_LOCAL_FOLDER="Local Folder"
COM_COMPONENTBUILDER_CONFIG_MAILER_DESCRIPTION="Select what mailer you would like to use to send emails."
COM_COMPONENTBUILDER_CONFIG_MAILER_LABEL="Mailer"
@@ -3567,6 +3580,9 @@ COM_COMPONENTBUILDER_CONFIG_PHP_MAIL="PHP Mail"
COM_COMPONENTBUILDER_CONFIG_PLACEHOLDERS_DESCRIPTION="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
COM_COMPONENTBUILDER_CONFIG_PLACEHOLDERS_LABEL="Add Custom Code Placeholders"
COM_COMPONENTBUILDER_CONFIG_REMOTE_SERVER="Remote Server"
+COM_COMPONENTBUILDER_CONFIG_REPEATABLETABLE_JOOMLA="Repeatable-table (joomla)"
+COM_COMPONENTBUILDER_CONFIG_REPEATABLE_JOOMLA="Repeatable (Joomla)"
+COM_COMPONENTBUILDER_CONFIG_REPEATABLE_UIKIT="Repeatable (UIkit)"
COM_COMPONENTBUILDER_CONFIG_REPLYNAME_DESCRIPTION="Text displayed in the header "Reply To:" field when replying to the site email. Usually the the person that receives the response. (leave blank for none)"
COM_COMPONENTBUILDER_CONFIG_REPLYNAME_HINT="Reply Name Here"
COM_COMPONENTBUILDER_CONFIG_REPLYNAME_LABEL="Reply to Name"
@@ -3602,6 +3618,8 @@ COM_COMPONENTBUILDER_CONFIG_SSL="SSL"
COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION="How long should the data that is stored in the browser memory remain unchanged before it is removed and updated."
COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL="Update Cycle"
COM_COMPONENTBUILDER_CONFIG_STRING_MANIPULATION="String Manipulation"
+COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_DESCRIPTION="Select the sub-form layouts you would like to use."
+COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_LABEL="Sub-form Layouts"
COM_COMPONENTBUILDER_CONFIG_TLS="TLS"
COM_COMPONENTBUILDER_CONFIG_TRUE="True"
COM_COMPONENTBUILDER_CONFIG_TYPE_NAME_BUILDER_DESCRIPTION="The default option only uses alphabetical characters and converts all numbers in field names to the English equivalent like 1 becomes one .%s "
COM_COMPONENTBUILDER_REQUIRES_THE_VALUE_ENTERED_BE_ONE_OF_THE_OPTIONS_IN_AN_ELEMENT_OF_TYPEQUOTLISTQUOT_THAT_IS_THAT_THE_ELEMENT_IS_A_SELECT_LIST="Requires the value entered be one of the options in an element of type="list": that is, that the element is a select list."
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 4ab41c6b1..3a4179ca2 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -13,7 +13,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->vyffields;
+$items = $displayData->vycfields;
$user = JFactory::getUser();
$id = $displayData->item->id;
// set the edit URL
@@ -118,8 +118,8 @@ $can = ComponentbuilderHelper::getActions('field');
store); ?>
- authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?>
- escape($item->category_title); ?>
+ authorise('core.edit', 'com_componentbuilder.field.category.' . (int)$item->catid)): ?>
+ escape($item->category_title); ?>
escape($item->category_title); ?>
diff --git a/admin/layouts/repeatablejcb.php b/admin/layouts/repeatablejcb.php
new file mode 100644
index 000000000..53d215068
--- /dev/null
+++ b/admin/layouts/repeatablejcb.php
@@ -0,0 +1,95 @@
+
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('JPATH_BASE') or die('Restricted access');
+
+/**
+ * Make thing clear
+ *
+ * @var JForm $tmpl The Empty form for template
+ * @var array $forms Array of JForm instances for render the rows
+ * @var bool $multiple The multiple state for the form field
+ * @var int $min Count of minimum repeating in multiple mode
+ * @var int $max Count of maximum repeating in multiple mode
+ * @var string $fieldname The field name
+ * @var string $control The forms control
+ * @var string $label The field label
+ * @var string $description The field description
+ * @var array $buttons Array of the buttons that will be rendered
+ * @var bool $groupByFieldset Whether group the subform fields by it`s fieldset
+ */
+extract($displayData);
+
+// Add script
+JHtml::_('jquery.ui', array('core', 'sortable'));
+JHtml::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));
+
+$sublayout = 'sectionjcb';
+
+?>
+
diff --git a/admin/layouts/sectionjcb.php b/admin/layouts/sectionjcb.php
new file mode 100644
index 000000000..bbcc14347
--- /dev/null
+++ b/admin/layouts/sectionjcb.php
@@ -0,0 +1,62 @@
+
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('JPATH_BASE') or die('Restricted access');
+
+/**
+ * Make thing clear
+ *
+ * @var JForm $form The form instance for render the section
+ * @var string $basegroup The base group name
+ * @var string $group Current group name
+ * @var array $buttons Array of the buttons that will be rendered
+ */
+extract($displayData);
+
+?>
+
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php
index 6c2657c4a..daa8d8f7c 100644
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ b/admin/layouts/server/linked_components_fullwidth.php
@@ -13,7 +13,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->vyplinked_components;
+$items = $displayData->vymlinked_components;
$user = JFactory::getUser();
$id = $displayData->item->id;
// set the edit URL
diff --git a/admin/models/admin_custom_tabs.php b/admin/models/admin_custom_tabs.php
index 0a4eb6efb..7d409ed04 100644
--- a/admin/models/admin_custom_tabs.php
+++ b/admin/models/admin_custom_tabs.php
@@ -225,6 +225,9 @@ class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
+
+ // update the tabs (sub form) layout
+ $form->setFieldAttribute('tabs', 'layout', ComponentbuilderHelper::getSubformLayout('admin_custom_tabs', 'tabs'));
return $form;
}
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index 821abede9..9b8950388 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -246,6 +246,9 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
+
+ // update the addfields (sub form) layout
+ $form->setFieldAttribute('addfields', 'layout', ComponentbuilderHelper::getSubformLayout('admin_fields', 'addfields'));
return $form;
}
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index 082d0a4ee..4888089d9 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -246,6 +246,9 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
+
+ // update the addconditions (sub form) layout
+ $form->setFieldAttribute('addconditions', 'layout', ComponentbuilderHelper::getSubformLayout('admin_fields_conditions', 'addconditions'));
return $form;
}
diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php
index 8da06e303..b24caee98 100644
--- a/admin/models/admin_fields_relations.php
+++ b/admin/models/admin_fields_relations.php
@@ -308,6 +308,9 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
+
+ // update the addrelations (sub form) layout
+ $form->setFieldAttribute('addrelations', 'layout', ComponentbuilderHelper::getSubformLayout('admin_fields_relations', 'addrelations'));
return $form;
}
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 0f469f420..e2b24a9b5 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -800,8 +800,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
}
- // Only load the GUID if new item
- if (0 == $id)
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
{
$form->setValue('guid', null, ComponentbuilderHelper::GUID());
}
@@ -984,7 +984,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
- if (ComponentbuilderHelper::checkString($data['not_required']))
+ if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
@@ -1491,8 +1491,15 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
}
// Set the GUID if empty or not valid
- if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "admin_view", $data['id']))
+ if (empty($data['guid']) && $data['id'] > 0)
{
+ // get the existing one
+ $data['guid'] = (string) ComponentbuilderHelper::getVar('admin_view', $data['id'], 'id', 'guid');
+ }
+ // Set the GUID if empty or not valid
+ while (!ComponentbuilderHelper::validGUID($data['guid'], "admin_view", $data['id']))
+ {
+ // must always be set
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index 35eecdbe0..2bff5e023 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -342,7 +342,7 @@ class ComponentbuilderModelAdmin_views extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -360,7 +360,24 @@ class ComponentbuilderModelAdmin_views extends JModelList
// From the componentbuilder_admin_view table
$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/class_method.php b/admin/models/class_method.php
index 004874715..2c799658a 100644
--- a/admin/models/class_method.php
+++ b/admin/models/class_method.php
@@ -342,8 +342,8 @@ class ComponentbuilderModelClass_method extends JModelAdmin
}
- // Only load the GUID if new item
- if (0 == $id)
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
{
$form->setValue('guid', null, ComponentbuilderHelper::GUID());
}
@@ -526,7 +526,7 @@ class ComponentbuilderModelClass_method extends JModelAdmin
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
- if (ComponentbuilderHelper::checkString($data['not_required']))
+ if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
@@ -972,8 +972,15 @@ class ComponentbuilderModelClass_method extends JModelAdmin
$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
// Set the GUID if empty or not valid
- if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "class_method", $data['id']))
+ if (empty($data['guid']) && $data['id'] > 0)
{
+ // get the existing one
+ $data['guid'] = (string) ComponentbuilderHelper::getVar('class_method', $data['id'], 'id', 'guid');
+ }
+ // Set the GUID if empty or not valid
+ while (!ComponentbuilderHelper::validGUID($data['guid'], "class_method", $data['id']))
+ {
+ // must always be set
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}
diff --git a/admin/models/class_methods.php b/admin/models/class_methods.php
index 0d9d4c9da..dbca552ae 100644
--- a/admin/models/class_methods.php
+++ b/admin/models/class_methods.php
@@ -269,7 +269,7 @@ class ComponentbuilderModelClass_methods extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -287,7 +287,24 @@ class ComponentbuilderModelClass_methods extends JModelList
// From the componentbuilder_class_method table
$query->from($db->quoteName('#__componentbuilder_class_method', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/class_properties.php b/admin/models/class_properties.php
index 9e9befe8a..db8ae024e 100644
--- a/admin/models/class_properties.php
+++ b/admin/models/class_properties.php
@@ -269,7 +269,7 @@ class ComponentbuilderModelClass_properties extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -287,7 +287,24 @@ class ComponentbuilderModelClass_properties extends JModelList
// From the componentbuilder_class_property table
$query->from($db->quoteName('#__componentbuilder_class_property', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/class_property.php b/admin/models/class_property.php
index 6a6af7baf..a941e2352 100644
--- a/admin/models/class_property.php
+++ b/admin/models/class_property.php
@@ -333,8 +333,8 @@ class ComponentbuilderModelClass_property extends JModelAdmin
}
- // Only load the GUID if new item
- if (0 == $id)
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
{
$form->setValue('guid', null, ComponentbuilderHelper::GUID());
}
@@ -517,7 +517,7 @@ class ComponentbuilderModelClass_property extends JModelAdmin
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
- if (ComponentbuilderHelper::checkString($data['not_required']))
+ if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
@@ -963,8 +963,15 @@ class ComponentbuilderModelClass_property extends JModelAdmin
$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
// Set the GUID if empty or not valid
- if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "class_property", $data['id']))
+ if (empty($data['guid']) && $data['id'] > 0)
{
+ // get the existing one
+ $data['guid'] = (string) ComponentbuilderHelper::getVar('class_property', $data['id'], 'id', 'guid');
+ }
+ // Set the GUID if empty or not valid
+ while (!ComponentbuilderHelper::validGUID($data['guid'], "class_property", $data['id']))
+ {
+ // must always be set
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}
diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php
index dd831be06..f143c1c35 100644
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@@ -257,6 +257,9 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
+
+ // update the addadmin_views (sub form) layout
+ $form->setFieldAttribute('addadmin_views', 'layout', ComponentbuilderHelper::getSubformLayout('component_admin_views', 'addadmin_views'));
return $form;
}
diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php
index 3a8c06f90..47f3bbda9 100644
--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@@ -257,6 +257,9 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
+
+ // update the addcustom_admin_views (sub form) layout
+ $form->setFieldAttribute('addcustom_admin_views', 'layout', ComponentbuilderHelper::getSubformLayout('component_custom_admin_views', 'addcustom_admin_views'));
return $form;
}
diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php
index 78df71326..5640efaa6 100644
--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@@ -257,6 +257,9 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
+
+ // update the addsite_views (sub form) layout
+ $form->setFieldAttribute('addsite_views', 'layout', ComponentbuilderHelper::getSubformLayout('component_site_views', 'addsite_views'));
return $form;
}
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index a21f8c5c7..91af2d657 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -506,8 +506,8 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
}
- // Only load the GUID if new item
- if (0 == $id)
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
{
$form->setValue('guid', null, ComponentbuilderHelper::GUID());
}
@@ -1125,8 +1125,15 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
}
// Set the GUID if empty or not valid
- if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "custom_admin_view", $data['id']))
+ if (empty($data['guid']) && $data['id'] > 0)
{
+ // get the existing one
+ $data['guid'] = (string) ComponentbuilderHelper::getVar('custom_admin_view', $data['id'], 'id', 'guid');
+ }
+ // Set the GUID if empty or not valid
+ while (!ComponentbuilderHelper::validGUID($data['guid'], "custom_admin_view", $data['id']))
+ {
+ // must always be set
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}
diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php
index ede100835..447816d19 100644
--- a/admin/models/custom_admin_views.php
+++ b/admin/models/custom_admin_views.php
@@ -283,7 +283,7 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -301,7 +301,24 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
// From the componentbuilder_custom_admin_view table
$query->from($db->quoteName('#__componentbuilder_custom_admin_view', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index 52003c0e3..25522e5a4 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -519,7 +519,7 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
- if (ComponentbuilderHelper::checkString($data['not_required']))
+ if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php
index d9745bf2d..3c016267e 100644
--- a/admin/models/custom_codes.php
+++ b/admin/models/custom_codes.php
@@ -316,7 +316,7 @@ class ComponentbuilderModelCustom_codes extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -334,7 +334,24 @@ class ComponentbuilderModelCustom_codes extends JModelList
// From the componentbuilder_custom_code table
$query->from($db->quoteName('#__componentbuilder_custom_code', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index d897a4af4..76cfb7d75 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -520,12 +520,18 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
}
- // Only load the GUID if new item
- if (0 == $id)
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
{
$form->setValue('guid', null, ComponentbuilderHelper::GUID());
}
+
+ // update the join_view_table (sub form) layout
+ $form->setFieldAttribute('join_view_table', 'layout', ComponentbuilderHelper::getSubformLayout('dynamic_get', 'join_view_table'));
+
+ // update the join_db_table (sub form) layout
+ $form->setFieldAttribute('join_db_table', 'layout', ComponentbuilderHelper::getSubformLayout('dynamic_get', 'join_db_table'));
return $form;
}
@@ -704,7 +710,7 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
- if (ComponentbuilderHelper::checkString($data['not_required']))
+ if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
@@ -1148,8 +1154,15 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
// Set the GUID if empty or not valid
- if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "dynamic_get", $data['id']))
+ if (empty($data['guid']) && $data['id'] > 0)
{
+ // get the existing one
+ $data['guid'] = (string) ComponentbuilderHelper::getVar('dynamic_get', $data['id'], 'id', 'guid');
+ }
+ // Set the GUID if empty or not valid
+ while (!ComponentbuilderHelper::validGUID($data['guid'], "dynamic_get", $data['id']))
+ {
+ // must always be set
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}
diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php
index 91356cf03..9f66a6f5b 100644
--- a/admin/models/dynamic_gets.php
+++ b/admin/models/dynamic_gets.php
@@ -266,7 +266,7 @@ class ComponentbuilderModelDynamic_gets extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -284,7 +284,24 @@ class ComponentbuilderModelDynamic_gets extends JModelList
// From the componentbuilder_dynamic_get table
$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/field.php b/admin/models/field.php
index 5cc2eafb8..cef6417a5 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -419,8 +419,8 @@ class ComponentbuilderModelField extends JModelAdmin
}
- // Only load the GUID if new item
- if (0 == $id)
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
{
$form->setValue('guid', null, ComponentbuilderHelper::GUID());
}
@@ -603,7 +603,7 @@ class ComponentbuilderModelField extends JModelAdmin
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
- if (ComponentbuilderHelper::checkString($data['not_required']))
+ if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
@@ -1144,8 +1144,15 @@ class ComponentbuilderModelField extends JModelAdmin
}
// Set the GUID if empty or not valid
- if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "field", $data['id']))
+ if (empty($data['guid']) && $data['id'] > 0)
{
+ // get the existing one
+ $data['guid'] = (string) ComponentbuilderHelper::getVar('field', $data['id'], 'id', 'guid');
+ }
+ // Set the GUID if empty or not valid
+ while (!ComponentbuilderHelper::validGUID($data['guid'], "field", $data['id']))
+ {
+ // must always be set
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}
diff --git a/admin/models/fields.php b/admin/models/fields.php
index 8eb0104d8..b6b8225b6 100644
--- a/admin/models/fields.php
+++ b/admin/models/fields.php
@@ -382,7 +382,7 @@ class ComponentbuilderModelFields extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -400,7 +400,24 @@ class ComponentbuilderModelFields extends JModelList
// From the componentbuilder_field table
$query->from($db->quoteName('#__componentbuilder_field', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/fields/adminlistvieworderfields.php b/admin/models/fields/adminlistvieworderfields.php
new file mode 100644
index 000000000..710ddf443
--- /dev/null
+++ b/admin/models/fields/adminlistvieworderfields.php
@@ -0,0 +1,99 @@
+
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Adminlistvieworderfields Form Field class for the Componentbuilder component
+ */
+class JFormFieldAdminlistvieworderfields extends JFormFieldList
+{
+ /**
+ * The adminlistvieworderfields field type.
+ *
+ * @var string
+ */
+ public $type = 'adminlistvieworderfields';
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ protected function getOptions()
+ {
+ // load the db object
+ $db = JFactory::getDBO();
+ // get the input from url
+ $jinput = JFactory::getApplication()->input;
+ // get the id
+ $adminView = $jinput->getInt('id', 0);
+ // check if we have an admin view
+ if (is_numeric($adminView) && $adminView >= 1)
+ {
+ // get all the fields linked to the admin view
+ if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
+ {
+ if (ComponentbuilderHelper::checkJson($addFields))
+ {
+ $addFields = json_decode($addFields, true);
+ if (ComponentbuilderHelper::checkArray($addFields))
+ {
+ foreach($addFields as $addField)
+ {
+ // admin list view and ordering
+ if (isset($addField['field']) && isset($addField['list']) && ($addField['list'] == 1 || $addField['list'] == 3)
+ && isset($addField['sort']) && $addField['sort'])
+ {
+ $fieldIds[] = (int) $addField['field'];
+ }
+ }
+ }
+ }
+ }
+ // filter by fields linked
+ if (ComponentbuilderHelper::checkArray($fieldIds))
+ {
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.name', 'a.xml', 'b.name'),array('id','name', 'xml', 'type')));
+ $query->from($db->quoteName('#__componentbuilder_field', 'a'));
+ $query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
+ $query->where($db->quoteName('a.published') . ' >= 1');
+ // only load these fields
+ $query->where($db->quoteName('a.id') . ' IN (' . implode(',', $fieldIds) . ')');
+ $query->order('a.name ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
+ $options = array();
+ if ($items)
+ {
+ $options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_SELECT_AN_OPTION'));
+ $options[] = JHtml::_('select.option', -1, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ID'). ' [ id - text ]');
+ $options[] = JHtml::_('select.option', -2, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ORDERING'). ' [ ordering - number ]');
+ $options[] = JHtml::_('select.option', -3, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_STATUS'). ' [ published - list ]');
+ foreach($items as $item)
+ {
+ // get the field name (TODO this could slow down the system so we will need to improve on this)
+ $field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
+ $options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+ }
+ }
+ return $options;
+ }
+ }
+ return false;
+ }
+}
diff --git a/admin/models/fields/linkedviewsorderfields.php b/admin/models/fields/linkedviewsorderfields.php
new file mode 100644
index 000000000..d9194bb41
--- /dev/null
+++ b/admin/models/fields/linkedviewsorderfields.php
@@ -0,0 +1,99 @@
+
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Linkedviewsorderfields Form Field class for the Componentbuilder component
+ */
+class JFormFieldLinkedviewsorderfields extends JFormFieldList
+{
+ /**
+ * The linkedviewsorderfields field type.
+ *
+ * @var string
+ */
+ public $type = 'linkedviewsorderfields';
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ protected function getOptions()
+ {
+ // load the db object
+ $db = JFactory::getDBO();
+ // get the input from url
+ $jinput = JFactory::getApplication()->input;
+ // get the id
+ $adminView = $jinput->getInt('id', 0);
+ // check if we have an admin view
+ if (is_numeric($adminView) && $adminView >= 1)
+ {
+ // get all the fields linked to the admin view
+ if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
+ {
+ if (ComponentbuilderHelper::checkJson($addFields))
+ {
+ $addFields = json_decode($addFields, true);
+ if (ComponentbuilderHelper::checkArray($addFields))
+ {
+ foreach($addFields as $addField)
+ {
+ // linked list views and ordering
+ if (isset($addField['field']) && isset($addField['list']) && ($addField['list'] == 1 || $addField['list'] == 4)
+ && isset($addField['sort']) && $addField['sort'])
+ {
+ $fieldIds[] = (int) $addField['field'];
+ }
+ }
+ }
+ }
+ }
+ // filter by fields linked
+ if (ComponentbuilderHelper::checkArray($fieldIds))
+ {
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.name', 'a.xml', 'b.name'),array('id','name', 'xml', 'type')));
+ $query->from($db->quoteName('#__componentbuilder_field', 'a'));
+ $query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
+ $query->where($db->quoteName('a.published') . ' >= 1');
+ // only load these fields
+ $query->where($db->quoteName('a.id') . ' IN (' . implode(',', $fieldIds) . ')');
+ $query->order('a.name ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
+ $options = array();
+ if ($items)
+ {
+ $options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_SELECT_AN_OPTION'));
+ $options[] = JHtml::_('select.option', -1, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ID'). ' [ id - text ]');
+ $options[] = JHtml::_('select.option', -2, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ORDERING'). ' [ ordering - number ]');
+ $options[] = JHtml::_('select.option', -3, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_STATUS'). ' [ published - list ]');
+ foreach($items as $item)
+ {
+ // get the field name (TODO this could slow down the system so we will need to improve on this)
+ $field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
+ $options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+ }
+ }
+ return $options;
+ }
+ }
+ return false;
+ }
+}
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index bc916c4f3..c0e9c11ec 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -249,7 +249,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVyffields()
+ public function getVycfields()
{
// Get the user object.
$user = JFactory::getUser();
@@ -337,13 +337,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
- $item->datatype = $this->selectionTranslationVyffields($item->datatype, 'datatype');
+ $item->datatype = $this->selectionTranslationVycfields($item->datatype, 'datatype');
// convert indexes
- $item->indexes = $this->selectionTranslationVyffields($item->indexes, 'indexes');
+ $item->indexes = $this->selectionTranslationVycfields($item->indexes, 'indexes');
// convert null_switch
- $item->null_switch = $this->selectionTranslationVyffields($item->null_switch, 'null_switch');
+ $item->null_switch = $this->selectionTranslationVycfields($item->null_switch, 'null_switch');
// convert store
- $item->store = $this->selectionTranslationVyffields($item->store, 'store');
+ $item->store = $this->selectionTranslationVycfields($item->store, 'store');
}
}
@@ -357,7 +357,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationVyffields($value,$name)
+ public function selectionTranslationVycfields($value,$name)
{
// Array of datatype language strings
if ($name === 'datatype')
@@ -544,8 +544,8 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
}
}
- // Only load the GUID if new item
- if (0 == $id)
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
{
$form->setValue('guid', null, ComponentbuilderHelper::GUID());
}
@@ -728,7 +728,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
- if (ComponentbuilderHelper::checkString($data['not_required']))
+ if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
@@ -1197,8 +1197,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
// Set the GUID if empty or not valid
- if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "fieldtype", $data['id']))
+ if (empty($data['guid']) && $data['id'] > 0)
{
+ // get the existing one
+ $data['guid'] = (string) ComponentbuilderHelper::getVar('fieldtype', $data['id'], 'id', 'guid');
+ }
+ // Set the GUID if empty or not valid
+ while (!ComponentbuilderHelper::validGUID($data['guid'], "fieldtype", $data['id']))
+ {
+ // must always be set
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}
diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php
index 399098cce..d4a5615aa 100644
--- a/admin/models/fieldtypes.php
+++ b/admin/models/fieldtypes.php
@@ -235,7 +235,7 @@ class ComponentbuilderModelFieldtypes extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (ComponentbuilderHelper::checkArray($pks))
+ if (($pks_size = ComponentbuilderHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -253,7 +253,24 @@ class ComponentbuilderModelFieldtypes extends JModelList
// From the componentbuilder_fieldtype table
$query->from($db->quoteName('#__componentbuilder_fieldtype', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
diff --git a/admin/models/forms/admin_custom_tabs.xml b/admin/models/forms/admin_custom_tabs.xml
index 786c03827..8153f3f82 100644
--- a/admin/models/forms/admin_custom_tabs.xml
+++ b/admin/models/forms/admin_custom_tabs.xml
@@ -103,7 +103,7 @@
type="subform"
name="tabs"
label="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_TABS_LABEL"
- layout="joomla.form.field.subform.repeatable-table"
+ layout="joomla.form.field.subform.repeatable"
multiple="true"
buttons="add,remove,move"
description="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_TABS_DESCRIPTION"
diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml
index b94b9b6cf..29917814f 100644
--- a/admin/models/forms/admin_fields.xml
+++ b/admin/models/forms/admin_fields.xml
@@ -103,7 +103,7 @@
type="subform"
name="addfields"
label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_LABEL"
- layout="joomla.form.field.subform.repeatable-table"
+ layout="repeatablejcb"
multiple="true"
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION"
default=""
diff --git a/admin/models/forms/admin_fields_conditions.xml b/admin/models/forms/admin_fields_conditions.xml
index ec148c220..1423d0631 100644
--- a/admin/models/forms/admin_fields_conditions.xml
+++ b/admin/models/forms/admin_fields_conditions.xml
@@ -103,7 +103,7 @@
type="subform"
name="addconditions"
label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_LABEL"
- layout="joomla.form.field.subform.repeatable"
+ layout="repeatablejcb"
multiple="true"
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_DESCRIPTION"
default=""
diff --git a/admin/models/forms/admin_fields_relations.xml b/admin/models/forms/admin_fields_relations.xml
index 46d660b6c..6b243214e 100644
--- a/admin/models/forms/admin_fields_relations.xml
+++ b/admin/models/forms/admin_fields_relations.xml
@@ -103,7 +103,7 @@
type="subform"
name="addrelations"
label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADDRELATIONS_LABEL"
- layout="joomla.form.field.subform.repeatable"
+ layout="repeatablejcb"
multiple="true"
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADDRELATIONS_DESCRIPTION"
default=""
diff --git a/admin/models/forms/component_admin_views.xml b/admin/models/forms/component_admin_views.xml
index 7236ff821..a7c6fd334 100644
--- a/admin/models/forms/component_admin_views.xml
+++ b/admin/models/forms/component_admin_views.xml
@@ -103,7 +103,7 @@
type="subform"
name="addadmin_views"
label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_LABEL"
- layout="joomla.form.field.subform.repeatable-table"
+ layout="repeatablejcb"
multiple="true"
description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_DESCRIPTION"
default="[{"submenu":"1","checkin":"1","history":"1","access":"1","port":"1"}]"
diff --git a/admin/models/forms/component_custom_admin_views.xml b/admin/models/forms/component_custom_admin_views.xml
index d4bb68794..720ad7f95 100644
--- a/admin/models/forms/component_custom_admin_views.xml
+++ b/admin/models/forms/component_custom_admin_views.xml
@@ -103,7 +103,7 @@
type="subform"
name="addcustom_admin_views"
label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS_LABEL"
- layout="joomla.form.field.subform.repeatable-table"
+ layout="repeatablejcb"
multiple="true"
default=""
icon="list">
diff --git a/admin/models/forms/component_site_views.xml b/admin/models/forms/component_site_views.xml
index 69519b668..86989bcc6 100644
--- a/admin/models/forms/component_site_views.xml
+++ b/admin/models/forms/component_site_views.xml
@@ -103,7 +103,7 @@
type="subform"
name="addsite_views"
label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_LABEL"
- layout="joomla.form.field.subform.repeatable-table"
+ layout="repeatablejcb"
multiple="true"
description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_DESCRIPTION"
default=""
diff --git a/admin/models/forms/custom_code.xml b/admin/models/forms/custom_code.xml
index 2d5d35ba3..382bae82a 100644
--- a/admin/models/forms/custom_code.xml
+++ b/admin/models/forms/custom_code.xml
@@ -90,7 +90,6 @@
type="component"
name="component"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL"
- description="JFIELD_TITLE_DESC"
class="list_class"
multiple="false"
default="0"
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml
index 19fc6f35b..bb3090580 100644
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@@ -227,7 +227,7 @@
type="subform"
name="join_db_table"
label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_LABEL"
- layout="joomla.form.field.subform.repeatable-table"
+ layout="repeatablejcb"
multiple="true"
description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_DESCRIPTION"
icon="list">
@@ -810,6 +810,16 @@
message="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_MESSAGE"
hint="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_HINT"
/>
+
+ \"', 1, '2015-04-08 00:36:16', '2018-07-08 00:11:05', 2, '', 105, '6c3a6983-d1bf-4e5e-9e99-deea00b0cefd'),
(682, '', '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', 'NOT NULL', '', 17, '\"
- user->authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?>
-
escape($item->category_title); ?>
+ user->authorise('core.edit', 'com_componentbuilder.field.category.' . (int)$item->catid)): ?>
+
escape($item->category_title); ?>
escape($item->category_title); ?>
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index 2beec06b4..bfa580282 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -138,7 +138,7 @@ class ComponentbuilderViewFields extends JViewLegacy
if ($this->user->authorise('field.run_expansion', 'com_componentbuilder'))
{
// add Run Expansion button.
- JToolBarHelper::custom('fields.runExpansion', 'expand-2', '', 'COM_COMPONENTBUILDER_RUN_EXPANSION', false);
+ JToolBarHelper::custom('fields.runExpansion', 'expand-2 custom-button-runexpansion', '', 'COM_COMPONENTBUILDER_RUN_EXPANSION', false);
}
if ($this->canDo->get('core.import') && $this->canDo->get('field.import'))
@@ -196,7 +196,7 @@ class ComponentbuilderViewFields extends JViewLegacy
JHtmlSidebar::addFilter(
JText::_('JOPTION_SELECT_CATEGORY'),
'filter_category_id',
- JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fields'), 'value', 'text', $this->state->get('filter.category_id'))
+ JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.field'), 'value', 'text', $this->state->get('filter.category_id'))
);
if ($this->canBatch && $this->canCreate && $this->canEdit)
@@ -205,7 +205,7 @@ class ComponentbuilderViewFields extends JViewLegacy
JHtmlBatch_::addListSelection(
JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY'),
'batch[category]',
- JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fields'), 'value', 'text')
+ JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.field'), 'value', 'text')
);
}
diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php
index 5a0419d1c..39f606a97 100644
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@@ -92,7 +92,7 @@ $componentParams = $this->params; // will be removed just use $this->params inst
tab_name = 'fieldtypeTab'; ?>
- canDo->get('fieldtype.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('fieldtype.edit.state') || $this->canDo->get('core.edit.created')) : ?>
+ canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.created') || $this->canDo->get('fieldtype.edit.state') || ($this->canDo->get('fieldtype.delete') && $this->canDo->get('fieldtype.edit.state'))) : ?>