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

added some updated notes to the paths area

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-03-02 04:08:40 +02:00
parent 836df43fcc
commit 1902604328
9 changed files with 389 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
admin/models/component_files_folders.php
View File

@ -95,20 +95,12 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
$item->metadata = $registry->toArray();
}
if (!empty($item->addfiles))
if (!empty($item->addfoldersfullpath))
{
// Convert the addfiles field to an array.
$addfiles = new Registry;
$addfiles->loadString($item->addfiles);
$item->addfiles = $addfiles->toArray();
}
if (!empty($item->addfolders))
{
// Convert the addfolders field to an array.
$addfolders = new Registry;
$addfolders->loadString($item->addfolders);
$item->addfolders = $addfolders->toArray();
// Convert the addfoldersfullpath field to an array.
$addfoldersfullpath = new Registry;
$addfoldersfullpath->loadString($item->addfoldersfullpath);
$item->addfoldersfullpath = $addfoldersfullpath->toArray();
}
if (!empty($item->addfilesfullpath))
@ -119,12 +111,20 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
$item->addfilesfullpath = $addfilesfullpath->toArray();
}
if (!empty($item->addfoldersfullpath))
if (!empty($item->addfolders))
{
// Convert the addfoldersfullpath field to an array.
$addfoldersfullpath = new Registry;
$addfoldersfullpath->loadString($item->addfoldersfullpath);
$item->addfoldersfullpath = $addfoldersfullpath->toArray();
// Convert the addfolders field to an array.
$addfolders = new Registry;
$addfolders->loadString($item->addfolders);
$item->addfolders = $addfolders->toArray();
}
if (!empty($item->addfiles))
{
// Convert the addfiles field to an array.
$addfiles = new Registry;
$addfiles->loadString($item->addfiles);
$item->addfiles = $addfiles->toArray();
}
// update the fields
@ -838,30 +838,17 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
// Set the addfiles items to data.
if (isset($data['addfiles']) && is_array($data['addfiles']))
// Set the addfoldersfullpath items to data.
if (isset($data['addfoldersfullpath']) && is_array($data['addfoldersfullpath']))
{
$addfiles = new JRegistry;
$addfiles->loadArray($data['addfiles']);
$data['addfiles'] = (string) $addfiles;
$addfoldersfullpath = new JRegistry;
$addfoldersfullpath->loadArray($data['addfoldersfullpath']);
$data['addfoldersfullpath'] = (string) $addfoldersfullpath;
}
elseif (!isset($data['addfiles']))
elseif (!isset($data['addfoldersfullpath']))
{
// Set the empty addfiles to data
$data['addfiles'] = '';
}
// Set the addfolders items to data.
if (isset($data['addfolders']) && is_array($data['addfolders']))
{
$addfolders = new JRegistry;
$addfolders->loadArray($data['addfolders']);
$data['addfolders'] = (string) $addfolders;
}
elseif (!isset($data['addfolders']))
{
// Set the empty addfolders to data
$data['addfolders'] = '';
// Set the empty addfoldersfullpath to data
$data['addfoldersfullpath'] = '';
}
// Set the addfilesfullpath items to data.
@ -877,17 +864,30 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
$data['addfilesfullpath'] = '';
}
// Set the addfoldersfullpath items to data.
if (isset($data['addfoldersfullpath']) && is_array($data['addfoldersfullpath']))
// Set the addfolders items to data.
if (isset($data['addfolders']) && is_array($data['addfolders']))
{
$addfoldersfullpath = new JRegistry;
$addfoldersfullpath->loadArray($data['addfoldersfullpath']);
$data['addfoldersfullpath'] = (string) $addfoldersfullpath;
$addfolders = new JRegistry;
$addfolders->loadArray($data['addfolders']);
$data['addfolders'] = (string) $addfolders;
}
elseif (!isset($data['addfoldersfullpath']))
elseif (!isset($data['addfolders']))
{
// Set the empty addfoldersfullpath to data
$data['addfoldersfullpath'] = '';
// Set the empty addfolders to data
$data['addfolders'] = '';
}
// Set the addfiles items to data.
if (isset($data['addfiles']) && is_array($data['addfiles']))
{
$addfiles = new JRegistry;
$addfiles->loadArray($data['addfiles']);
$data['addfiles'] = (string) $addfiles;
}
elseif (!isset($data['addfiles']))
{
// Set the empty addfiles to data
$data['addfiles'] = '';
}
// Set the Params Items to data