From d7d4ec43e6babeebaab358885c59c685db04b20c Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 20 May 2019 14:14:43 +0200 Subject: [PATCH] Added the options to include the xml files to also be target with custom code placeholders. --- README.md | 2 +- admin/README.txt | 2 +- admin/helpers/compiler/a_Get.php | 32 +++++++++++++++++--------------- componentbuilder.xml | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 19e759ab3..5c0a7d231 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 16th May, 2019 ++ *Last Build*: 20th May, 2019 + *Version*: 2.9.18 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/README.txt b/admin/README.txt index 19e759ab3..5c0a7d231 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -146,7 +146,7 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 16th May, 2019 ++ *Last Build*: 20th May, 2019 + *Version*: 2.9.18 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 50adbd094..dc9b2c255 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -5743,7 +5743,7 @@ class Get $joomla = getcwd(); $counter = array(1 => 0, 2 => 0); // file types to get - $fileTypes = array('\.php', '\.js'); + $fileTypes = array('\.php', '\.js', '\.xml'); // set some local placeholders $placeholders = array(); $placeholders[ComponentbuilderHelper::safeString($this->componentCodeName, 'F') . 'Helper::'] = $this->bbb . 'Component' . $this->ddd . 'Helper::'; @@ -5756,20 +5756,24 @@ class Get chdir($path); foreach ($fileTypes as $type) { - // get a list of files in the current directory tree (only PHP and JS for now) + // get a list of files in the current directory tree (only PHP, JS and XML for now) $files = JFolder::files('.', $type, true, true); - foreach ($files as $file) + // check if files found + if (ComponentbuilderHelper::checkArray($files)) { - $this->searchFileContent($counter, $file, $target, $this->customCodePlaceholders, $placeholders, $today); - // insert new code - if (ComponentbuilderHelper::checkArray($this->newCustomCode)) + foreach ($files as $file) { - $this->setNewCustomCode(100); - } - // update existing custom code - if (ComponentbuilderHelper::checkArray($this->existingCustomCode)) - { - $this->setExistingCustomCode(30); + $this->searchFileContent($counter, $file, $target, $this->customCodePlaceholders, $placeholders, $today); + // insert new code + if (ComponentbuilderHelper::checkArray($this->newCustomCode)) + { + $this->setNewCustomCode(100); + } + // update existing custom code + if (ComponentbuilderHelper::checkArray($this->existingCustomCode)) + { + $this->setExistingCustomCode(30); + } } } } @@ -6189,7 +6193,7 @@ class Get * @param string $updateString The string to update * @param string $string The string to use lang update * - * @return array + * @return string * */ protected function setReverseLangPlaceholders($updateString, $string) @@ -6263,8 +6267,6 @@ class Get * 1 -> Just replace (default) * 2 -> Check if data string has placeholders * 3 -> Remove placeholders not in data string - * - * @param int $langSwitch The lang switch * * @return string * diff --git a/componentbuilder.xml b/componentbuilder.xml index 6f6e3261f..3302e3f15 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 16th May, 2019 + 20th May, 2019 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com