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

Major code formate to try and set a standared. Added four new fields for JavaScript files

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-12-15 01:10:47 +02:00
parent c9cad158e6
commit d3cbea5c82
172 changed files with 14538 additions and 14358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
admin/models/custom_admin_view.php
View File

@ -103,14 +103,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->libraries = $libraries->toArray();
}
if (!empty($item->custom_button))
{
// Convert the custom_button field to an array.
$custom_button = new Registry;
$custom_button->loadString($item->custom_button);
$item->custom_button = $custom_button->toArray();
}
if (!empty($item->custom_get))
{
// Convert the custom_get field to an array.
@ -119,6 +111,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->custom_get = $custom_get->toArray();
}
if (!empty($item->custom_button))
{
// Convert the custom_button field to an array.
$custom_button = new Registry;
$custom_button->loadString($item->custom_button);
$item->custom_button = $custom_button->toArray();
}
if (!empty($item->php_controller))
{
// base64 Decode php_controller.
@ -137,6 +137,30 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->php_model = base64_decode($item->php_model);
}
if (!empty($item->js_document))
{
// base64 Decode js_document.
$item->js_document = base64_decode($item->js_document);
}
if (!empty($item->javascript_file))
{
// base64 Decode javascript_file.
$item->javascript_file = base64_decode($item->javascript_file);
}
if (!empty($item->css_document))
{
// base64 Decode css_document.
$item->css_document = base64_decode($item->css_document);
}
if (!empty($item->css))
{
// base64 Decode css.
$item->css = base64_decode($item->css);
}
if (!empty($item->php_document))
{
// base64 Decode php_document.
@ -161,24 +185,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->php_jview = base64_decode($item->php_jview);
}
if (!empty($item->js_document))
{
// base64 Decode js_document.
$item->js_document = base64_decode($item->js_document);
}
if (!empty($item->css_document))
{
// base64 Decode css_document.
$item->css_document = base64_decode($item->css_document);
}
if (!empty($item->css))
{
// base64 Decode css.
$item->css = base64_decode($item->css);
}
// check what type of custom_button array we have here (should be subform... but just incase)
// This could happen due to huge data sets
if (isset($item->custom_button) && isset($item->custom_button['name']))
@ -939,19 +945,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['libraries'] = '';
}
// Set the custom_button items to data.
if (isset($data['custom_button']) && is_array($data['custom_button']))
{
$custom_button = new JRegistry;
$custom_button->loadArray($data['custom_button']);
$data['custom_button'] = (string) $custom_button;
}
elseif (!isset($data['custom_button']))
{
// Set the empty custom_button to data
$data['custom_button'] = '';
}
// Set the custom_get items to data.
if (isset($data['custom_get']) && is_array($data['custom_get']))
{
@ -965,6 +958,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['custom_get'] = '';
}
// Set the custom_button items to data.
if (isset($data['custom_button']) && is_array($data['custom_button']))
{
$custom_button = new JRegistry;
$custom_button->loadArray($data['custom_button']);
$data['custom_button'] = (string) $custom_button;
}
elseif (!isset($data['custom_button']))
{
// Set the empty custom_button to data
$data['custom_button'] = '';
}
// Set the php_controller string to base64 string.
if (isset($data['php_controller']))
{
@ -983,6 +989,30 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['php_model'] = base64_encode($data['php_model']);
}
// Set the js_document string to base64 string.
if (isset($data['js_document']))
{
$data['js_document'] = base64_encode($data['js_document']);
}
// Set the javascript_file string to base64 string.
if (isset($data['javascript_file']))
{
$data['javascript_file'] = base64_encode($data['javascript_file']);
}
// Set the css_document string to base64 string.
if (isset($data['css_document']))
{
$data['css_document'] = base64_encode($data['css_document']);
}
// Set the css string to base64 string.
if (isset($data['css']))
{
$data['css'] = base64_encode($data['css']);
}
// Set the php_document string to base64 string.
if (isset($data['php_document']))
{
@ -1005,24 +1035,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
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']))
{
$data['js_document'] = base64_encode($data['js_document']);
}
// Set the css_document string to base64 string.
if (isset($data['css_document']))
{
$data['css_document'] = base64_encode($data['css_document']);
}
// Set the css string to base64 string.
if (isset($data['css']))
{
$data['css'] = base64_encode($data['css']);
}
// Set the Params Items to data