%s<
COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_S="The package key is: %s"
COM_COMPONENTBUILDER_THE_README_IS_LOADING="The readme is loading"
COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CHANGED_THE_LOCAL_BNAMESB_OF_EITHER_OR_THE_BSNIPPET_LIBRARY_OR_SNIPPET_TYPESB_IN_ANY_SMALL_WAY_THE_SYSTEM_WILL_NOT_BE_ABLE_TO_CONNECT_YOUR_LOCAL_SNIPPETS_WITH_THOSE_IN_THE_COMMUNITY_REPOSITORY_SO_WE_STRONGLY_ADVICE_TO_BKEEP_TO_THE_COMMUNITY_NAMINGB_TO_AVOID_MISMATCHING_THAT_WILL_IN_TURN_CAUSE_DUPLICATION_SO_IF_YOU_CHANGED_ANY_NAMES_JUST_CHANGE_THEM_BACK_AND_ALL_WILL_AGAIN_WORK_AS_EXPECTED="The search for the snippets are case sensitive so if you changed the local names of either or the snippet, library or snippet types in any small way, the system will not be able to connect your local snippets with those in the community repository. So we strongly advice to keep to the community naming to avoid mismatching, that will in turn cause duplication. So if you changed any names, just change them back and all will again work as expected."
-COM_COMPONENTBUILDER_THE_SNIPPETS_ARE="The snippets are"
COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED="The Snippets Were Successfully Exported!"
COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Successfully Exported!"
COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
index 08124678f..34db21cf3 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
@@ -446,6 +446,8 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets
COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the custom admin views button."
COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the layouts button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS="Get Snippets Libraries Button Access"
+COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the libraries button."
COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS="Get Snippets Site Views Button Access"
COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the site views button."
COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
@@ -650,6 +652,8 @@ COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_EDIT_VERSION="Libraries Files
COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version libraries files folders urls"
COM_COMPONENTBUILDER_LIBRARIES_SUBMENU="Libraries Submenu"
COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the library"
+COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
+COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
COM_COMPONENTBUILDER_MENU="» Component Builder"
COM_COMPONENTBUILDER_MENU_ADMIN_VIEWS="Admin Views"
COM_COMPONENTBUILDER_MENU_COMPILER="Compiler"
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index b57918936..e107a5bfe 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -28,7 +28,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->vzwfields;
+$items = $displayData->vzxfields;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php
index a437256a6..a6afd46b0 100644
--- a/admin/layouts/ftp/linked_components_fullwidth.php
+++ b/admin/layouts/ftp/linked_components_fullwidth.php
@@ -28,7 +28,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->vzxlinked_components;
+$items = $displayData->vzylinked_components;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
diff --git a/admin/layouts/library/behaviour_above.php b/admin/layouts/library/behaviour_above.php
index 55d0e6df3..31b448755 100644
--- a/admin/layouts/library/behaviour_above.php
+++ b/admin/layouts/library/behaviour_above.php
@@ -31,7 +31,8 @@ $form = $displayData->getForm();
$fields = array(
'name',
- 'how'
+ 'how',
+ 'type'
);
?>
diff --git a/admin/layouts/library/behaviour_left.php b/admin/layouts/library/behaviour_left.php
new file mode 100644
index 000000000..c34288a0d
--- /dev/null
+++ b/admin/layouts/library/behaviour_left.php
@@ -0,0 +1,54 @@
+
+ @github Joomla Component Builder
+ @copyright Copyright (C) 2015. All Rights Reserved
+ @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+ Builds Complex Joomla Components
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+ 'libraries'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+foreach ($fields as $field)
+{
+ $field = is_array($field) ? $field : array($field);
+ foreach ($field as $f)
+ {
+ if ($form->getField($f))
+ {
+ if (in_array($f, $hiddenFields))
+ {
+ $form->setFieldAttribute($f, 'type', 'hidden');
+ }
+
+ echo $form->renderField($f);
+ break;
+ }
+ }
+}
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index f5736e200..6d06cd9a3 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -1084,26 +1084,79 @@ class ComponentbuilderModelAjax extends JModelList
if (ComponentbuilderHelper::checkArray($libraries))
{
// insure we only have int values
- $libraries = array_map( function($id){ return (int) $id; }, $libraries);
- // Get a db connection.
- $db = JFactory::getDbo();
- // Create a new query object.
- $query = $db->getQuery(true);
- $query->select($db->quoteName( array('a.id') ));
- $query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
- $query->where($db->quoteName('a.published') . ' = 1');
- // check for country and region
- $query->where($db->quoteName('a.library') . ' IN ('. implode(',',$libraries) .')');
- $db->setQuery($query);
- $db->execute();
- if ($db->getNumRows())
+ if ($libraries = $this->checkLibraries($libraries))
{
- return $db->loadColumn();
+ // Get a db connection.
+ $db = JFactory::getDbo();
+ // Create a new query object.
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName( array('a.id') ));
+ $query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
+ $query->where($db->quoteName('a.published') . ' = 1');
+ // check for country and region
+ $query->where($db->quoteName('a.library') . ' IN ('. implode(',',$libraries) .')');
+ $db->setQuery($query);
+ $db->execute();
+ if ($db->getNumRows())
+ {
+ return $db->loadColumn();
+ }
}
}
return false;
}
-
+
+ protected function checkLibraries($libraries)
+ {
+ $bucket = array();
+ $libraries = array_map( function($id) use (&$bucket) {
+ // now get bundled libraries
+ $type = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'type');
+ if (2 == $type && $bundled = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'libraries'))
+ {
+ // make sure we have an array if it was json
+ if (ComponentbuilderHelper::checkJson($bundled))
+ {
+ $bundled = json_decode($bundled, true);
+ }
+ // load in the values if we have an array
+ if (ComponentbuilderHelper::checkArray($bundled))
+ {
+ foreach ($bundled as $lib)
+ {
+ $bucket[$lib] = $lib;
+ }
+ }
+ elseif (is_numeric($bundled))
+ {
+ $bucket[(int) $bundled] = (int) $bundled;
+ }
+ }
+ else
+ {
+ return (int) $id;
+ }
+ }, $libraries);
+ // check if we have any bundled libraries
+ if (ComponentbuilderHelper::checkArray($bucket))
+ {
+ foreach ($bucket as $lib)
+ {
+ $libraries[] = (int) $lib;
+ }
+ }
+ // check that we have libraries
+ if (ComponentbuilderHelper::checkArray($libraries))
+ {
+ $libraries = array_values(array_unique(array_filter($libraries, function($id){return is_int($id);})));
+ // check if we have any libraries remaining
+ if (ComponentbuilderHelper::checkArray($libraries))
+ {
+ return $libraries;
+ }
+ }
+ return false;
+ }
// Used in template
public function getTemplateDetails($id)
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 138b84f24..7c91fe535 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -923,6 +923,9 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
+ // always reset the snippets
+ $data['snippet'] = 0;
+
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
diff --git a/admin/models/fields/librariesx.php b/admin/models/fields/librariesx.php
new file mode 100644
index 000000000..e46f771ed
--- /dev/null
+++ b/admin/models/fields/librariesx.php
@@ -0,0 +1,178 @@
+
+ @github Joomla Component Builder
+ @copyright Copyright (C) 2015. All Rights Reserved
+ @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+ Builds Complex Joomla Components
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Librariesx Form Field class for the Componentbuilder component
+ */
+class JFormFieldLibrariesx extends JFormFieldList
+{
+ /**
+ * The librariesx field type.
+ *
+ * @var string
+ */
+ public $type = 'librariesx';
+ /**
+ * Override to add new button
+ *
+ * @return string The field input markup.
+ *
+ * @since 3.2
+ */
+ protected function getInput()
+ {
+ // see if we should add buttons
+ $setButton = $this->getAttribute('button');
+ // get html
+ $html = parent::getInput();
+ // if true set button
+ if ($setButton === 'true')
+ {
+ $button = array();
+ $script = array();
+ $buttonName = $this->getAttribute('name');
+ // get the input from url
+ $app = JFactory::getApplication();
+ $jinput = $app->input;
+ // get the view name & id
+ $values = $jinput->getArray(array(
+ 'id' => 'int',
+ 'view' => 'word'
+ ));
+ // check if new item
+ $ref = '';
+ $refJ = '';
+ if (!is_null($values['id']) && strlen($values['view']))
+ {
+ // only load referal if not new item.
+ $ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+ $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+ }
+ $user = JFactory::getUser();
+ // only add if user allowed to create library
+ if ($user->authorise('library.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+ {
+ // build Create button
+ $buttonNamee = trim($buttonName);
+ $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+ $buttonNamee = ucfirst(strtolower($buttonNamee));
+ $button[] = '
+ ';
+ }
+ // only add if user allowed to edit library
+ if (($buttonName === 'library' || $buttonName === 'libraries') && $user->authorise('library.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+ {
+ // build edit button
+ $buttonNamee = trim($buttonName);
+ $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+ $buttonNamee = ucfirst(strtolower($buttonNamee));
+ $button[] = '';
+ // build script
+ $script[] = "
+ jQuery(document).ready(function() {
+ jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+ e.preventDefault();
+ var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+ ".$buttonName."Button(".$buttonName."Value);
+ });
+ var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+ ".$buttonName."Button(".$buttonName."Value);
+ });
+ function ".$buttonName."Button(value) {
+ if (value > 0) {
+ // hide the create button
+ jQuery('#".$buttonName."Create').hide();
+ // show edit button
+ jQuery('#".$buttonName."Edit').show();
+ var url = 'index.php?option=com_componentbuilder&view=libraries&task=library.edit&id='+value+'".$refJ."';
+ jQuery('#".$buttonName."Edit').attr('href', url);
+ } else {
+ // show the create button
+ jQuery('#".$buttonName."Create').show();
+ // hide edit button
+ jQuery('#".$buttonName."Edit').hide();
+ }
+ }";
+ }
+ // check if button was created for library field.
+ if (is_array($button) && count($button) > 0)
+ {
+ // Load the needed script.
+ $document = JFactory::getDocument();
+ $document->addScriptDeclaration(implode(' ',$script));
+ // return the button attached to input field.
+ return '' .$html . implode('',$button).'';
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ public function getOptions()
+ {
+ // get the input from url
+ $jinput = JFactory::getApplication()->input;
+ // get the library id
+ $libID = $jinput->getInt('id', 0);
+ $db = JFactory::getDBO();
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
+ $query->from($db->quoteName('#__componentbuilder_library', 'a'));
+ $query->where($db->quoteName('a.published') . ' >= 1');
+ if ($libID > 0)
+ {
+ $query->where($db->quoteName('a.id') . ' != ' . (int) $libID);
+ }
+ $query->order('a.name ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
+ $options = array();
+ if ($items)
+ {
+ foreach($items as $item)
+ {
+ $options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
+ }
+ }
+ return $options;
+ }
+}
diff --git a/admin/models/fields/library.php b/admin/models/fields/library.php
index 2c2d744cf..feaa47928 100644
--- a/admin/models/fields/library.php
+++ b/admin/models/fields/library.php
@@ -153,7 +153,8 @@ class JFormFieldLibrary extends JFormFieldList
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.name'),array('id','library_name')));
$query->from($db->quoteName('#__componentbuilder_library', 'a'));
- $query->where($db->quoteName('a.published') . ' >= 1');
+ $query->where($db->quoteName('a.published') . ' >= 1');
+ $query->where($db->quoteName('a.type') . ' = 1');
$query->order('a.name ASC');
$db->setQuery((string)$query);
$items = $db->loadObjectList();
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index b7a7378e4..9168d46f8 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVzwfields()
+ public function getVzxfields()
{
// Get the user object.
$user = JFactory::getUser();
@@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
- $item->datatype = $this->selectionTranslationVzwfields($item->datatype, 'datatype');
+ $item->datatype = $this->selectionTranslationVzxfields($item->datatype, 'datatype');
// convert indexes
- $item->indexes = $this->selectionTranslationVzwfields($item->indexes, 'indexes');
+ $item->indexes = $this->selectionTranslationVzxfields($item->indexes, 'indexes');
// convert null_switch
- $item->null_switch = $this->selectionTranslationVzwfields($item->null_switch, 'null_switch');
+ $item->null_switch = $this->selectionTranslationVzxfields($item->null_switch, 'null_switch');
// convert store
- $item->store = $this->selectionTranslationVzwfields($item->store, 'store');
+ $item->store = $this->selectionTranslationVzxfields($item->store, 'store');
}
}
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationVzwfields($value,$name)
+ public function selectionTranslationVzxfields($value,$name)
{
// Array of datatype language strings
if ($name === 'datatype')
diff --git a/admin/models/forms/component_config.xml b/admin/models/forms/component_config.xml
index c6498e705..9a5a7a14a 100644
--- a/admin/models/forms/component_config.xml
+++ b/admin/models/forms/component_config.xml
@@ -107,12 +107,10 @@
type="subform"
name="addconfig"
label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_LABEL"
- layout="joomla.form.field.subform.repeatable-table"
multiple="true"
description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_DESCRIPTION"
icon="list"
- maximum="500"
- filter="ARRAY">
+ maximum="500">
-
+