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

Made some changes to insure JCB is stable in PHP7, removed the related translations string from joomla_component view to speed up page load.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-03-12 00:36:14 +02:00
parent eb56fd3b48
commit e715fa1614
76 changed files with 3297 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
admin/models/custom_admin_view.php
View File

@ -100,14 +100,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->metadata = $registry->toArray();
}
if (!empty($item->libraries))
{
// Convert the libraries field to an array.
$libraries = new Registry;
$libraries->loadString($item->libraries);
$item->libraries = $libraries->toArray();
}
if (!empty($item->ajax_input))
{
// Convert the ajax_input field to an array.
@ -116,6 +108,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->ajax_input = $ajax_input->toArray();
}
if (!empty($item->libraries))
{
// Convert the libraries field to an array.
$libraries = new Registry;
$libraries->loadString($item->libraries);
$item->libraries = $libraries->toArray();
}
if (!empty($item->custom_get))
{
// Convert the custom_get field to an array.
@ -132,12 +132,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->custom_button = $custom_button->toArray();
}
if (!empty($item->php_document))
{
// base64 Decode php_document.
$item->php_document = base64_decode($item->php_document);
}
if (!empty($item->php_jview_display))
{
// base64 Decode php_jview_display.
@ -150,10 +144,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->php_view = base64_decode($item->php_view);
}
if (!empty($item->php_jview))
if (!empty($item->php_document))
{
// base64 Decode php_jview.
$item->php_jview = base64_decode($item->php_jview);
// base64 Decode php_document.
$item->php_document = base64_decode($item->php_document);
}
if (!empty($item->default))
@ -162,6 +156,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->default = base64_decode($item->default);
}
if (!empty($item->php_jview))
{
// base64 Decode php_jview.
$item->php_jview = base64_decode($item->php_jview);
}
if (!empty($item->js_document))
{
// base64 Decode js_document.
@ -962,19 +962,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
// always reset the snippets
$data['snippet'] = 0;
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
$libraries = new JRegistry;
$libraries->loadArray($data['libraries']);
$data['libraries'] = (string) $libraries;
}
elseif (!isset($data['libraries']))
{
// Set the empty libraries to data
$data['libraries'] = '';
}
// Set the ajax_input items to data.
if (isset($data['ajax_input']) && is_array($data['ajax_input']))
{
@ -988,6 +975,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['ajax_input'] = '';
}
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
$libraries = new JRegistry;
$libraries->loadArray($data['libraries']);
$data['libraries'] = (string) $libraries;
}
elseif (!isset($data['libraries']))
{
// Set the empty libraries to data
$data['libraries'] = '';
}
// Set the custom_get items to data.
if (isset($data['custom_get']) && is_array($data['custom_get']))
{
@ -1014,12 +1014,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['custom_button'] = '';
}
// Set the php_document string to base64 string.
if (isset($data['php_document']))
{
$data['php_document'] = base64_encode($data['php_document']);
}
// Set the php_jview_display string to base64 string.
if (isset($data['php_jview_display']))
{
@ -1032,10 +1026,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['php_view'] = base64_encode($data['php_view']);
}
// Set the php_jview string to base64 string.
if (isset($data['php_jview']))
// Set the php_document string to base64 string.
if (isset($data['php_document']))
{
$data['php_jview'] = base64_encode($data['php_jview']);
$data['php_document'] = base64_encode($data['php_document']);
}
// Set the default string to base64 string.
@ -1044,6 +1038,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['default'] = base64_encode($data['default']);
}
// Set the php_jview string to base64 string.
if (isset($data['php_jview']))
{
$data['php_jview'] = base64_encode($data['php_jview']);
}
// Set the js_document string to base64 string.
if (isset($data['js_document']))
{