Skip to content

Commit

Permalink
Merge pull request #33 from JPathRu/j4
Browse files Browse the repository at this point in the history 
J4
  • Loading branch information
@dmitriitux
dmitriitux authored Jun 30, 2023
2 parents c59ddc0 + 2f843e3 commit 3f657a4
Show file tree
Hide file tree
Showing 31 changed files with 2,066 additions and 971 deletions.
138 changes: 69 additions & 69 deletions fields/pluginlayout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,87 +48,87 @@ class JFormFieldPluginlayout extends FormField
protected function getInput()
{
// Get the client id.
$clientId = $this->element[ 'client_id' ];
$clientId = $this->element['client_id'];

if ( $clientId === null && $this->form instanceof Form )
if ($clientId === null && $this->form instanceof Form)
{
$clientId = $this->form->getValue( 'client_id' );
$clientId = $this->form->getValue('client_id');
}

$clientId = (int) $clientId;

$client = ApplicationHelper::getClientInfo( $clientId );
$client = ApplicationHelper::getClientInfo($clientId);

// Get the plugin.
if ( ( $this->form instanceof Form ) )
if (($this->form instanceof Form))
{
$plugin = $this->form->getValue( 'type' );
$plugin = $this->form->getValue('type');
}

if(substr_count($plugin, '_') > 0)
if (substr_count($plugin, '_') > 0)
{
$tmp = explode('_', $plugin);
$plugin = $tmp[1];
$tmp = explode('_', $plugin);
$plugin = $tmp[1];
$pluginOriginal = $tmp[0];
$plugin = preg_replace( '#\W#', '', $plugin );
$folder = 'radicalmultifield';
$plugin = preg_replace('#\W#', '', $plugin);
$folder = 'radicalmultifield';
$pluginFullName = 'plg_' . $folder . '_' . $plugin;
}
else
{
$plugin = preg_replace( '#\W#', '', $plugin );
$folder = 'fields';
$plugin = preg_replace('#\W#', '', $plugin);
$folder = 'fields';
$pluginFullName = 'plg_' . $folder . '_' . $plugin;
}

// Get the template.
$template = (string) $this->element[ 'template' ];
$template = preg_replace( '#\W#', '', $template );
$template = (string) $this->element['template'];
$template = preg_replace('#\W#', '', $template);

// Get the style.
$template_style_id = '';
if ( $this->form instanceof Form )
if ($this->form instanceof Form)
{
$template_style_id = $this->form->getValue( 'template_style_id' );
$template_style_id = preg_replace( '#\W#', '', $template_style_id );
$template_style_id = $this->form->getValue('template_style_id');
$template_style_id = preg_replace('#\W#', '', $template_style_id);
}

// If an extension and view are present build the options.
if ( $plugin && $client )
if ($plugin && $client)
{
// Load language file
$lang = Factory::getLanguage();
$lang->load( $plugin . '.sys', $client->path, null, false, true )
|| $lang->load( $plugin . '.sys', $client->path . '/plugins/' . $folder . '/' . $plugin, null, false, true );
$lang->load($plugin . '.sys', $client->path, null, false, true)
|| $lang->load($plugin . '.sys', $client->path . '/plugins/' . $folder . '/' . $plugin, null, false, true);

// Get the database object and a new query object.
$db = Factory::getDbo();
$query = $db->getQuery( true );
$db = Factory::getDbo();
$query = $db->getQuery(true);

// Build the query.
$query->select( 'element, name' )
->from( '#__extensions as e' )
->where( 'e.client_id = ' . (int) $clientId )
->where( 'e.type = ' . $db->quote('template' ) )
->where( 'e.enabled = 1' );
$query->select('element, name')
->from('#__extensions as e')
->where('e.client_id = ' . (int) $clientId)
->where('e.type = ' . $db->quote('template'))
->where('e.enabled = 1');

if ( $template )
if ($template)
{
$query->where( 'e.element = ' . $db->quote( $template ) );
$query->where('e.element = ' . $db->quote($template));
}

if ( $template_style_id )
if ($template_style_id)
{
$query->join( 'LEFT', '#__template_styles as s on s.template=e.element' )
->where( 's.id=' . (int) $template_style_id );
$query->join('LEFT', '#__template_styles as s on s.template=e.element')
->where('s.id=' . (int) $template_style_id);
}

// Set the query and load the templates.
$db->setQuery( $query );
$templates = $db->loadObjectList( 'element' );
$db->setQuery($query);
$templates = $db->loadObjectList('element');

// Build the search paths for plugin layouts.
$plugin_path = realpath( Path::clean( $client->path . '/plugins/' . $folder . '/' . $plugin . '/tmpl' ) );
$plugin_path = realpath(Path::clean($client->path . '/plugins/' . $folder . '/' . $plugin . '/tmpl'));

// Prepare array of component layouts
$plugin_layouts = [];
Expand All @@ -137,83 +137,83 @@ protected function getInput()
$groups = [];

// Add the layout options from the plugin path.
if ( is_dir( $plugin_path ) && ( $plugin_layouts = Folder::files( $plugin_path, '^[^_]*\.php$' ) ) )
if (is_dir($plugin_path) && ($plugin_layouts = Folder::files($plugin_path, '^[^_]*\.php$')))
{
// Create the group for the plugin
$groups[ '_' ] = [];
$groups[ '_' ][ 'id' ] = $this->id . '__';
$groups[ '_' ][ 'text' ] = Text::sprintf( 'JOPTION_FROM_PLUGIN' );
$groups[ '_' ][ 'items' ] = [];
foreach ( $plugin_layouts as $file )
$groups['_'] = [];
$groups['_']['id'] = $this->id . '__';
$groups['_']['text'] = Text::sprintf('JOPTION_FROM_PLUGIN');
$groups['_']['items'] = [];

foreach ($plugin_layouts as $file)
{
// Add an option to the plugin group
$value = basename( $file, '.php' );
$text = $lang->hasKey( $key = strtoupper( $plugin . '_LAYOUT_' . $value ) ) ? Text::_( $key ) : $value;
$groups[ '_' ][ 'items' ][] = HTMLHelper::_( 'select.option', '_:' . $value, $text );
$value = basename($file, '.php');
$text = $lang->hasKey($key = strtoupper($plugin . '_LAYOUT_' . $value)) ? Text::_($key) : $value;
$groups['_']['items'][] = HTMLHelper::_('select.option', '_:' . $value, $text);
}
}

// Loop on all templates
if ( $templates )
if ($templates)
{
foreach ( $templates as $template )
foreach ($templates as $template)
{
// Load language file
$lang->load( 'tpl_' . $template->element . '.sys', $client->path, null, false, true )
|| $lang->load( 'tpl_' . $template->element . '.sys', $client->path . '/templates/' . $template->element, null, false, true );
$lang->load('tpl_' . $template->element . '.sys', $client->path, null, false, true)
|| $lang->load('tpl_' . $template->element . '.sys', $client->path . '/templates/' . $template->element, null, false, true);

$template_path = Path::clean( $client->path . '/templates/' . $template->element . '/html/plg_' . $folder . '_' . $plugin );
$template_path = Path::clean($client->path . '/templates/' . $template->element . '/html/plg_' . $folder . '_' . $plugin);

// Add the layout options from the template path.
if ( is_dir( $template_path ) && ( $files = Folder::files( $template_path, '^[^_]*\.php$' ) ) )
if (is_dir($template_path) && ($files = Folder::files($template_path, '^[^_]*\.php$')))
{
foreach ( $files as $i => $file )
foreach ($files as $i => $file)
{
// Remove layout that already exist in component ones
if ( in_array( $file, $plugin_layouts ) )
if (in_array($file, $plugin_layouts))
{
unset( $files[ $i ] );
unset($files[$i]);
}
}

if ( count( $files ) )
if (count($files))
{
// Create the group for the template
$groups[ $template->element ] = [];
$groups[ $template->element ][ 'id' ] = $this->id . '_' . $template->element;
$groups[ $template->element ][ 'text' ] = Text::sprintf( 'JOPTION_FROM_TEMPLATE', $template->name );
$groups[ $template->element ][ 'items' ] = [];
$groups[$template->element] = [];
$groups[$template->element]['id'] = $this->id . '_' . $template->element;
$groups[$template->element]['text'] = Text::sprintf('JOPTION_FROM_TEMPLATE', $template->name);
$groups[$template->element]['items'] = [];

foreach ( $files as $file )
foreach ($files as $file)
{
// Add an option to the template group
$value = basename( $file, '.php' );
$text = $lang->hasKey( $key = strtoupper( 'TPL_' . $template->element . '_' . $plugin . '_LAYOUT_' . $value ) )
$value = basename($file, '.php');
$text = $lang->hasKey($key = strtoupper('TPL_' . $template->element . '_' . $plugin . '_LAYOUT_' . $value))
? Text::_($key) : $value;
$groups[ $template->element ][ 'items' ][] = HTMLHelper::_( 'select.option', $template->element . ':' . $value, $text );
$groups[$template->element]['items'][] = HTMLHelper::_('select.option', $template->element . ':' . $value, $text);
}
}
}
}
}
// Compute attributes for the grouped list
$attr = $this->element[ 'size' ] ? ' size="' . (int) $this->element[ 'size' ] . '"' : '';
$attr .= $this->element[ 'class' ] ? ' class="' . (string) $this->element[ 'class' ] . '"' : '';
$attr = $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
$attr .= $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';

// Prepare HTML code
$html = [];

// Compute the current selected values
$selected = [ $this->value ];
$selected = [$this->value];

// Add a grouped list
$html[] = HTMLHelper::_(
'select.groupedlist', $groups, $this->name,
[ 'id' => $this->id, 'group.id' => 'id', 'list.attr' => $attr, 'list.select' => $selected ]
['id' => $this->id, 'group.id' => 'id', 'list.attr' => $attr, 'list.select' => $selected]
);

return implode( $html );
return implode($html);
}
else
{
Expand Down
Loading

0 comments on commit 3f657a4

Please sign in to comment.