';
-
- foreach ($values as $nr => $value)
- {
- // set the value for the row
- $this->setRows($nr, $this->setValue($header, $value), $rows);
- }
- }
- }
- // close header start body
- $table .= '
';
- // add rows to table
- if (ComponentbuilderHelper::checkArray($rows))
- {
- foreach ($rows as $row)
- {
- $table .= '
'.$row.'
';
- }
- }
- // close the body and table
- $table .= '
';
- // return the table
- return $table;
- }
- }
- return false;
- }
-
- protected function setValue($header, $value)
- {
- if (array_key_exists($header, $this->functionArray) && method_exists($this, $this->functionArray[$header]))
- {
- $value = $this->{$this->functionArray[$header]}($header, $value);
- }
- // if no value are set
- if (!ComponentbuilderHelper::checkString($value))
- {
- $value = '-';
- }
- // make total stand out
- if ('total' == $header)
- {
- $value = ''.$value.'';
- }
- return $value;
- }
-
- protected function setRows($nr, $value, &$rows)
- {
- // build rows
- if (!isset($rows[$nr]))
- {
- $rows[$nr] = '
'.$value.'
';
- }
- else
- {
- $rows[$nr] .= '
'.$value.'
';
- }
- }
protected $viewid = array();
diff --git a/admin/models/compiler.php b/admin/models/compiler.php
index 142d7d20e..434ac8f16 100644
--- a/admin/models/compiler.php
+++ b/admin/models/compiler.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 53 of this MVC
- @build 5th August, 2017
+ @version @update number 55 of this MVC
+ @build 13th September, 2017
@created 1st February, 2017
@package Component Builder
@subpackage compiler.php
@@ -164,12 +164,12 @@ class ComponentbuilderModelCompiler extends JModelList
return $db->loadObjectList();
}
- public function builder($version, $id, $backup, $git, $addPlaceholders, $debugLinenr)
+ public function builder($version, $id, $backup, $repo, $addPlaceholders, $debugLinenr)
{
$set['joomlaVersion'] = $version;
$set['componentId'] = $id;
$set['addBackup'] = $backup;
- $set['addGit'] = $git;
+ $set['addRepo'] = $repo;
$set['addPlaceholders'] = $addPlaceholders;
$set['debugLinenr'] = $debugLinenr;
// start up Compiler
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index 364663e10..ddaa8178f 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
index a8c3fccf0..a4ce700d8 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviewfolderlist.php
diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php
index f373b53ec..1a60eaf19 100644
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index 5709c8f04..b9492be58 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage articles.php
diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php
index 8eb90ba88..bcf45505b 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage component.php
diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php
index 623b354b2..f18be2ba6 100644
--- a/admin/models/fields/components.php
+++ b/admin/models/fields/components.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage components.php
diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php
index 6be42116e..4ecbe0f5a 100644
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customadminviews.php
diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php
index 7e6bd70a0..6d85af2b1 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfilelist.php
diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php
index 4e5f1e564..51adc93d6 100644
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfolderlist.php
diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php
index 4683d5f95..6cb4675c5 100644
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customgets.php
diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php
index 5529fa27e..a1c11ff5a 100644
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dbtables.php
diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php
index 90ecd539c..ee85f49cc 100644
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicget.php
diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php
index 7c7d7bfc5..d7045bffd 100644
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicgets.php
diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php
index cf61e0488..4c5e361f6 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php
diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php
index 7f877dea8..0ec370804 100644
--- a/admin/models/fields/fieldsmulti.php
+++ b/admin/models/fields/fieldsmulti.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldsmulti.php
diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php
index 2a3bdbe70..71d386c01 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php
diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php
index 482522b65..029b35b32 100644
--- a/admin/models/fields/lang.php
+++ b/admin/models/fields/lang.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage lang.php
diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php
index c8979ff48..2362dae6b 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php
diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
index 5ae9182bf..8554c62b6 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviewfolderlist.php
diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php
index 15cf3b8bb..0dc27bf79 100644
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviews.php
diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php
index 1f6d890e4..c1d6be5d7 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php
diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js
index a943db15f..683eb5bbf 100644
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.js
diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js
index 03a4aea69..416274992 100644
--- a/admin/models/forms/language_translation.js
+++ b/admin/models/forms/language_translation.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 39 of this MVC
- @build 7th April, 2017
+ @version @update number 43 of this MVC
+ @build 16th September, 2017
@created 3rd April, 2017
@package Component Builder
@subpackage language_translation.js
@@ -26,39 +26,9 @@
jQuery(document).ready(function($)
{
- // build table of translations
- var translation = encodeURIComponent(jQuery('#jform_translation').val());
- if (translation) {
- getBuildTable(translation,'jform_translation');
- }
// set button to add more languages
addButton('language','components');
});
-
-function getBuildTable_server(string, idName){
- var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getBuildTable&format=json&vdm="+vastDevMod);
- if(token.length > 0 && string.length > 0 && idName.length > 0){
- var request = 'token='+token+'&idName='+idName+'&object='+string;
- }
- return jQuery.ajax({
- type: 'GET',
- url: getUrl,
- dataType: 'jsonp',
- data: request,
- jsonp: 'callback'
- });
-}
-function getBuildTable(string, idName){
- getBuildTable_server(string, idName).done(function(result) {
- jQuery('#table_'+idName).remove();
- if(result){
- addData(result, '#'+idName);
- }
- })
-}
-function addData(result, where){
- jQuery(where).closest('.control-group').parent().append(result);
-}
function addButton_server(type){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){
diff --git a/admin/models/forms/language_translation.xml b/admin/models/forms/language_translation.xml
index 6b6e450d0..39dc5d687 100644
--- a/admin/models/forms/language_translation.xml
+++ b/admin/models/forms/language_translation.xml
@@ -104,44 +104,41 @@
readonly="true"
disabled="true"
/>
-
+
-
-
-
+ maximum="200">
+
translation) && isset($item->localTranslation)
- && ComponentbuilderHelper::checkJson($item->translation)
+ && ComponentbuilderHelper::checkJson($item->translation)
&& ComponentbuilderHelper::checkJson($item->localTranslation))
{
- $translations = json_decode($item->translation, true);
- $localTranslations = json_decode($item->localTranslation, true);
- foreach ($localTranslations['translation'] as $nr => $value)
+ $newTranslations = json_decode($item->translation, true);
+ $localTranslations = json_decode($item->localTranslation, true); // always the new format
+ $translations = array();
+ $pointer = 0;
+ $checker = array();
+ // okay we have the old format lets merge on that basis
+ if (isset($newTranslations['translation']))
{
- // only keep old translation if the new does not have this translation & language
- if (!in_array($value, $translations['translation']) && !in_array($localTranslations['language'][$nr], $translations['language']))
+ foreach ($localTranslations as $value)
{
- $translations['translation'][] = $value;
- $translations['language'][] = $localTranslations['language'][$nr];
+ // only keep old translation if the new does not have this translation & language
+ if (!in_array($value['language'], $newTranslations['language']))
+ {
+ $translations['translation' . $pointer] = array('translation' => $value['translation'], 'language' => $value['language']);
+ $pointer++;
+ }
+ }
+ foreach ($newTranslations['translation'] as $nr => $newTrans)
+ {
+ // now convert the new translation array
+ $translations['translation' . $pointer] = array('translation' => $newTrans, 'language' => $newTranslations['language'][$nr]);
+ $pointer++;
}
}
- $item->translation = json_encode($translations);
+ // okay this is the new format lets merge on that basis
+ elseif (ComponentbuilderHelper::checkArray($newTranslations))
+ {
+ $translations = $newTranslations;
+ $pointer = count($translations);
+ foreach ($localTranslations as $value)
+ {
+ $keepLocal = true;
+ foreach ($newTranslations as $newValue)
+ {
+ // only keep old translation if the new does not have this translation & language
+ if ($value['language'] === $newValue['language'])
+ {
+ $keepLocal = false;
+ }
+ }
+ if ($keepLocal)
+ {
+ $translations['translation' . $pointer] = array('translation' => $value['translation'], 'language' => $value['language']);
+ $pointer++;
+ }
+ }
+ }
+ // okay seem to only have local translations
+ elseif (ComponentbuilderHelper::checkArray($localTranslations))
+ {
+ $translations = $localTranslations;
+ }
+ // only update if we have translations
+ if (ComponentbuilderHelper::checkArray($translations))
+ {
+ $item->translation = json_encode($translations);
+ }
}
- elseif (isset($item->localTranslation) && ComponentbuilderHelper::checkJson($item->localTranslation))
+ elseif (isset($item->localTranslation) && ComponentbuilderHelper::checkJson($item->localTranslation))
{
$item->translation = $item->localTranslation;
}
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index e86533de5..4f94876f0 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.php
@@ -598,11 +598,15 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
if (ComponentbuilderHelper::checkJson($item->translation))
{
$translations = json_decode($item->translation, true);
- if (ComponentbuilderHelper::checkArray($translations) && isset($translations['language']) && ComponentbuilderHelper::checkArray($translations['language']))
+ if (ComponentbuilderHelper::checkArray($translations))
{
- foreach ($translations['language'] as $language)
+ foreach ($translations as $language)
{
- $langBucket[$language] = $language;
+ if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+ && isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+ {
+ $langBucket[$language['language']] = $language['language'];
+ }
}
}
}
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index 479278527..518e25b71 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_components.php
@@ -530,6 +530,40 @@ class ComponentbuilderModelJoomla_components extends JModelList
{
$values = json_decode($values, true);
}
+ // check if the key is an array (targeting subform)
+ if (ComponentbuilderHelper::checkArray($key) && isset($key['subform']) && ComponentbuilderHelper::checkArray($values))
+ {
+ $subform = $key['subform'];
+ $key = $key['key'];
+ $tmpBucket = array($key => array());
+ foreach ($values as $value)
+ {
+ if (isset($value[$subform]))
+ {
+ if ('language' === $subform)
+ {
+ $tmpBucket[$key][] = (int) ComponentbuilderHelper::getVar('language', $value[$subform], 'langtag', 'id');
+ }
+ else
+ {
+ $tmpBucket[$key][] = $value[$subform];
+ }
+ }
+ }
+ if (ComponentbuilderHelper::checkArray($tmpBucket[$key]))
+ {
+ // now set the values back
+ $values = $tmpBucket;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ elseif (ComponentbuilderHelper::checkArray($key))
+ {
+ return false;
+ }
// make sure we have an array
if (('custom_code' !== $table && 'component' !== $key && 'custom_get' !== $key) && (!ComponentbuilderHelper::checkArray($values) || !isset($values[$key]) || !ComponentbuilderHelper::checkArray($values[$key])))
{
@@ -1013,8 +1047,8 @@ class ComponentbuilderModelJoomla_components extends JModelList
$this->smartExport['language_translation'][$item->id] = $item;
// add languages
if (isset($item->translation))
- {
- $this->setData('language', $item->translation, 'language');
+ {
+ $this->setData('language', $item->translation, array('key' => 'language', 'subform' => 'language'));
}
}
}
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index 1b98010e7..134b89aef 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 39 of this MVC
- @build 7th April, 2017
+ @version @update number 43 of this MVC
+ @build 16th September, 2017
@created 3rd April, 2017
@package Component Builder
@subpackage language_translation.php
@@ -100,6 +100,14 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
$item->metadata = $registry->toArray();
}
+ if (!empty($item->translation))
+ {
+ // Convert the translation field to an array.
+ $translation = new Registry;
+ $translation->loadString($item->translation);
+ $item->translation = $translation->toArray();
+ }
+
if (!empty($item->components))
{
// JSON Decode components.
@@ -814,6 +822,19 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
+ // Set the translation items to data.
+ if (isset($data['translation']) && is_array($data['translation']))
+ {
+ $translation = new JRegistry;
+ $translation->loadArray($data['translation']);
+ $data['translation'] = (string) $translation;
+ }
+ elseif (!isset($data['translation']))
+ {
+ // Set the empty translation to data
+ $data['translation'] = '';
+ }
+
// Set the components string to JSON string.
if (isset($data['components']))
{
diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php
index 4bbc63a46..bf2ce2320 100644
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 39 of this MVC
- @build 7th April, 2017
+ @version @update number 43 of this MVC
+ @build 16th September, 2017
@created 3rd April, 2017
@package Component Builder
@subpackage language_translations.php
@@ -128,11 +128,15 @@ class ComponentbuilderModelLanguage_translations extends JModelList
if (ComponentbuilderHelper::checkJson($item->translation))
{
$translations = json_decode($item->translation, true);
- if (ComponentbuilderHelper::checkArray($translations) && isset($translations['language']) && ComponentbuilderHelper::checkArray($translations['language']))
+ if (ComponentbuilderHelper::checkArray($translations))
{
- foreach ($translations['language'] as $language)
+ foreach ($translations as $language)
{
- $langBucket[$language] = $language;
+ if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+ && isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+ {
+ $langBucket[$language['language']] = $language['language'];
+ }
}
}
}
@@ -310,11 +314,15 @@ class ComponentbuilderModelLanguage_translations extends JModelList
if (ComponentbuilderHelper::checkJson($item->translation))
{
$translations = json_decode($item->translation, true);
- if (ComponentbuilderHelper::checkArray($translations) && isset($translations['language']) && ComponentbuilderHelper::checkArray($translations['language']))
+ if (ComponentbuilderHelper::checkArray($translations))
{
- foreach ($translations['language'] as $language)
+ foreach ($translations as $language)
{
- $langBucket[$language] = $language;
+ if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+ && isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+ {
+ $langBucket[$language['language']] = $language['language'];
+ }
}
}
}
diff --git a/admin/sql/updates/mysql/2.5.4.sql b/admin/sql/updates/mysql/2.5.4.sql
new file mode 100644
index 000000000..d3f5a12fa
--- /dev/null
+++ b/admin/sql/updates/mysql/2.5.4.sql
@@ -0,0 +1 @@
+
diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php
index beb29a17c..71c7fb5f1 100644
--- a/admin/tables/joomla_component.php
+++ b/admin/tables/joomla_component.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.php
diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php
index 42150b941..5ad029a7d 100644
--- a/admin/tables/language_translation.php
+++ b/admin/tables/language_translation.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 39 of this MVC
- @build 7th April, 2017
+ @version @update number 43 of this MVC
+ @build 16th September, 2017
@created 3rd April, 2017
@package Component Builder
@subpackage language_translation.php
diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php
index 2471038c5..61710e5f2 100644
--- a/admin/views/compiler/tmpl/default.php
+++ b/admin/views/compiler/tmpl/default.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 53 of this MVC
- @build 5th August, 2017
+ @version @update number 55 of this MVC
+ @build 13th September, 2017
@created 1st February, 2017
@package Component Builder
@subpackage default.php
diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php
index 44dbc9a38..4e5642537 100644
--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 53 of this MVC
- @build 5th August, 2017
+ @version @update number 55 of this MVC
+ @build 13th September, 2017
@created 1st February, 2017
@package Component Builder
@subpackage view.html.php
@@ -93,17 +93,17 @@ class ComponentbuilderViewCompiler extends JViewLegacy
$radio1->setup($sales,0);
$radio2 = JFormHelper::loadFieldType('radio',true);
- // start building add to git folder xml field
- $xml = '';
+ // start building add to repository folder xml field
+ $xml = '';
$xml .= ' ';
$xml .= "";
// prepare the xml
- $git = new SimpleXMLElement($xml);
+ $repository = new SimpleXMLElement($xml);
// set components to form
- $radio2->setup($git,1);
+ $radio2->setup($repository,1);
$radio3 = JFormHelper::loadFieldType('radio',true);
- // start building add to git folder xml field
+ // start building custom code placeholders
$xml = '';
$xml .= ' ';
$xml .= "";
@@ -113,8 +113,8 @@ class ComponentbuilderViewCompiler extends JViewLegacy
$radio3->setup($placeholder,2);
$radio4 = JFormHelper::loadFieldType('radio',true);
- // start building add to git folder xml field
- $xml = '';
+ // add debug line numbers
+ $xml = '';
$xml .= ' ';
$xml .= "";
// prepare the xml
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index c9b3137ed..a134b8dd6 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default.php
diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php
index e1b8082f6..1d57180f0 100644
--- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php
+++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_closed_issues_the_closed_issues_on_github.php
diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php
index 0e6954648..32fc09fda 100644
--- a/admin/views/componentbuilder/tmpl/default_main.php
+++ b/admin/views/componentbuilder/tmpl/default_main.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_main.php
diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php
index 3c1a7a554..b38ba1fc9 100644
--- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php
+++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_open_issues_the_open_issues_on_github.php
diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php
index a675825eb..cdc4c8d7f 100644
--- a/admin/views/componentbuilder/tmpl/default_readme_information.php
+++ b/admin/views/componentbuilder/tmpl/default_readme_information.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_readme_information.php
diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php
index e47758a98..d4a54e3fc 100644
--- a/admin/views/componentbuilder/tmpl/default_releases_information.php
+++ b/admin/views/componentbuilder/tmpl/default_releases_information.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_releases_information.php
diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
index dc4b5ea43..8b37f247a 100644
--- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
+++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_vast_development_method_notice_board.php
diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php
index 817d08a10..bd9c0bdfb 100644
--- a/admin/views/componentbuilder/tmpl/default_vdm.php
+++ b/admin/views/componentbuilder/tmpl/default_vdm.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default_vdm.php
diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php
index bca05445c..8c1b862ee 100644
--- a/admin/views/componentbuilder/view.html.php
+++ b/admin/views/componentbuilder/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage view.html.php
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index 64d23d464..abccdd2d5 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default.php
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 4cf6af359..b98b21e41 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage view.html.php
diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php
index 24b03d534..e04e3cfa4 100644
--- a/admin/views/import_joomla_components/tmpl/default.php
+++ b/admin/views/import_joomla_components/tmpl/default.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage default.php
diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php
index 6be73b313..1f1af76be 100644
--- a/admin/views/import_joomla_components/view.html.php
+++ b/admin/views/import_joomla_components/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version 2.5.4
- @build 13th September, 2017
+ @version 2.5.5
+ @build 17th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage view.html.php
diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js
index 98d9c8927..6d8a08e3d 100644
--- a/admin/views/joomla_component/submitbutton.js
+++ b/admin/views/joomla_component/submitbutton.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage submitbutton.js
diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php
index 0c2fc14d2..2492d702d 100644
--- a/admin/views/joomla_component/tmpl/edit.php
+++ b/admin/views/joomla_component/tmpl/edit.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage edit.php
diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php
index 23396b85e..193e6496d 100644
--- a/admin/views/joomla_component/view.html.php
+++ b/admin/views/joomla_component/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage view.html.php
diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php
index 2bb39388e..c8d821ecf 100644
--- a/admin/views/joomla_components/tmpl/default.php
+++ b/admin/views/joomla_components/tmpl/default.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default.php
diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php
index a82068a39..c0abc1404 100644
--- a/admin/views/joomla_components/tmpl/default_batch_body.php
+++ b/admin/views/joomla_components/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_batch_body.php
diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php
index 1f1c9059c..1388800a9 100644
--- a/admin/views/joomla_components/tmpl/default_batch_footer.php
+++ b/admin/views/joomla_components/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_batch_footer.php
diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php
index 855bf6f30..c77983d38 100644
--- a/admin/views/joomla_components/tmpl/default_body.php
+++ b/admin/views/joomla_components/tmpl/default_body.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_body.php
diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php
index 32ce8d477..972701c66 100644
--- a/admin/views/joomla_components/tmpl/default_foot.php
+++ b/admin/views/joomla_components/tmpl/default_foot.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_foot.php
diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php
index cd1b0a165..7b5c58b2e 100644
--- a/admin/views/joomla_components/tmpl/default_head.php
+++ b/admin/views/joomla_components/tmpl/default_head.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_head.php
diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php
index 3054eeb04..738676eb7 100644
--- a/admin/views/joomla_components/tmpl/default_toolbar.php
+++ b/admin/views/joomla_components/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage default_toolbar.php
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index 194e1642d..ceaa8cac1 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 366 of this MVC
- @build 7th September, 2017
+ @version @update number 375 of this MVC
+ @build 17th September, 2017
@created 6th May, 2015
@package Component Builder
@subpackage view.html.php
diff --git a/admin/views/language_translation/submitbutton.js b/admin/views/language_translation/submitbutton.js
index 6cbefbba2..df2cd26dc 100644
--- a/admin/views/language_translation/submitbutton.js
+++ b/admin/views/language_translation/submitbutton.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 39 of this MVC
- @build 7th April, 2017
+ @version @update number 43 of this MVC
+ @build 16th September, 2017
@created 3rd April, 2017
@package Component Builder
@subpackage submitbutton.js
diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php
index 9b13c6d1e..d14d90ec2 100644
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 39 of this MVC
- @build 7th April, 2017
+ @version @update number 43 of this MVC
+ @build 16th September, 2017
@created 3rd April, 2017
@package Component Builder
@subpackage edit.php
@@ -119,12 +119,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');