Component Builder (v.2.12.15)
+ Component Builder (v.2.12.16)
The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 8a3e5eac1..1aec446ae 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -1041,10 +1041,10 @@
Builds Complex Joomla Components
com_componentbuilder
component
- 2.12.15
+ 2.12.16
http://www.joomlacomponentbuilder.com
- https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.15/JCB_v2.12.15.zip
+ https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.16/JCB_v2.12.16.zip
stable
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities.php
index b9d779352..7656d7c77 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Utilities.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities.php
@@ -555,6 +555,44 @@ trait Utilities
{
return FileHelper::write($path, $data);
}
+
+ /**
+ * get all the file paths in folder and sub folders
+ *
+ * @param string $folder The local path to parse
+ * @param array $fileTypes The type of files to get
+ *
+ * @return void
+ *
+ * @since 3.0.9
+ *
+ * @deprecated 4.0 - Use FileHelper::getPaths($folder, $fileTypes , $recurse, $full);
+ */
+ public static function getAllFilePaths($folder, $fileTypes = array('\.php', '\.js', '\.css', '\.less'), $recurse = true, $full = true)
+ {
+ return FileHelper::getPaths($folder, $fileTypes , $recurse, $full);
+ }
+
+ /**
+ * Get the file path or url
+ *
+ * @param string $type The (url/path) type to return
+ * @param string $target The Params Target name (if set)
+ * @param string $fileType The kind of filename to generate (if not set no file name is generated)
+ * @param string $key The key to adjust the filename (if not set ignored)
+ * @param string $default The default path if not set in Params (fallback path)
+ * @param bool $createIfNotSet The switch to create the folder if not found
+ *
+ * @return string On success the path or url is returned based on the type requested
+ *
+ * @since 3.0.9
+ *
+ * @deprecated 4.0 - Use FileHelper::getPath($type, $target, $fileType, $key, $default, $createIfNotSet);
+ */
+ public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = '', $createIfNotSet = true)
+ {
+ return FileHelper::getPath($type, $target, $fileType, $key, $default, $createIfNotSet);
+ }
}
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php
index 74100c8af..afa3bb290 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php
@@ -13,11 +13,13 @@
namespace VDM\Joomla\Utilities;
+use Joomla\CMS\Uri\Uri;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Filesystem\Path;
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Component\ComponentHelper;
use Joomla\Archive\Archive;
@@ -37,6 +39,15 @@ abstract class FileHelper
*/
protected static $curlError = false;
+ /**
+ * The component params
+ *
+ * @var object
+ *
+ * @since 3.0.9
+ */
+ protected static $params = false;
+
/**
* The zipper method
*
@@ -176,6 +187,141 @@ abstract class FileHelper
}
return $klaar;
}
+
+ /**
+ * get all the file paths in folder and sub folders
+ *
+ * @param string $folder The local path to parse
+ * @param array $fileTypes The type of files to get
+ *
+ * @return void
+ *
+ * @since 3.0.9
+ */
+ public static function getPaths($folder, $fileTypes = array('\.php', '\.js', '\.css', '\.less'), $recurse = true, $full = true)
+ {
+ if (Folder::exists($folder))
+ {
+ // we must first store the current woking directory
+ $joomla = getcwd();
+ // we are changing the working directory to the component path
+ chdir($folder);
+
+ // make sure we have file type filter
+ if (ArrayHelper::check($fileTypes))
+ {
+ // get the files
+ foreach ($fileTypes as $type)
+ {
+ // get a list of files in the current directory tree
+ $files[] = Folder::files('.', $type, $recurse, $full);
+ }
+ }
+ elseif (StringHelper::check($fileTypes))
+ {
+ // get a list of files in the current directory tree
+ $files[] = Folder::files('.', $fileTypes, $recurse, $full);
+ }
+ else
+ {
+ // get a list of files in the current directory tree
+ $files[] = Folder::files('.', '.', $recurse, $full);
+ }
+
+ // change back to Joomla working directory
+ chdir($joomla);
+
+ // return array of files
+ return array_map( function($file) { return str_replace('./', '/', $file); }, (array) ArrayHelper::merge($files));
+ }
+ return false;
+ }
+
+ /**
+ * Get the file path or url
+ *
+ * @param string $type The (url/path) type to return
+ * @param string $target The Params Target name (if set)
+ * @param string $fileType The kind of filename to generate (if not set no file name is generated)
+ * @param string $key The key to adjust the filename (if not set ignored)
+ * @param string $default The default path if not set in Params (fallback path)
+ * @param bool $createIfNotSet The switch to create the folder if not found
+ *
+ * @return string On success the path or url is returned based on the type requested
+ *
+ * @since 3.0.9
+ */
+ public static function getPath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = '', $createIfNotSet = true)
+ {
+ // make sure to always have a string/path
+ if(!StringHelper::check($default))
+ {
+ $default = JPATH_SITE . '/images/';
+ }
+
+ // get the global settings
+ if (!ObjectHelper::check(self::$params))
+ {
+ self::$params = ComponentHelper::getParams('com_componentbuilder');
+ }
+ $filePath = self::$params->get($target, $default);
+
+ // check the file path (revert to default only of not a hidden file path)
+ if ('hiddenfilepath' !== $target && strpos($filePath, JPATH_SITE) === false)
+ {
+ $filePath = $default;
+ }
+
+ // create the folder if it does not exist
+ if ($createIfNotSet && !Folder::exists($filePath))
+ {
+ Folder::create($filePath);
+ }
+
+ // setup the file name
+ $fileName = '';
+
+ // Get basic key
+ $basickey = 'Th!s_iS_n0t_sAfe_buT_b3tter_then_n0thiug';
+ if (method_exists('ComponentbuilderHelper', "getCryptKey"))
+ {
+ $basickey = ComponentbuilderHelper::getCryptKey('basic', $basickey);
+ }
+
+ // check the key
+ if (!StringHelper::check($key))
+ {
+ $key = 'vDm';
+ }
+
+ // set the file name
+ if (StringHelper::check($fileType))
+ {
+ // set the name
+ $fileName = trim(md5($type . $target . $basickey . $key) . '.' . trim($fileType, '.'));
+ }
+ else
+ {
+ $fileName = trim(md5($type . $target . $basickey . $key)) . '.txt';
+ }
+
+ // return the url
+ if ('url' === $type)
+ {
+ if (strpos($filePath, JPATH_SITE) !== false)
+ {
+ $filePath = trim( str_replace( JPATH_SITE, '', $filePath), '/');
+
+ return Uri::root() . $filePath . '/' . $fileName;
+ }
+
+ // since the path is behind the root folder of the site, return only the root url (may be used to build the link)
+ return Uri::root();
+ }
+
+ // sanitize the path
+ return '/' . trim( $filePath, '/' ) . '/' . $fileName;
+ }
}
diff --git a/script.php b/script.php
index 5c939a7cd..0dbd6ab6a 100644
--- a/script.php
+++ b/script.php
@@ -9254,7 +9254,7 @@ class com_componentbuilderInstallerScript
echo '
- Upgrade to Version 2.12.15 Was Successful! Let us know if anything is not working as expected.
';
+ Upgrade to Version 2.12.16 Was Successful! Let us know if anything is not working as expected.
';
// Set db if not set already.
if (!isset($db))
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index a1adbdcf1..780cae1ff 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -1025,51 +1025,6 @@ abstract class ComponentbuilderHelper
}
}
- /**
- * get all the file paths in folder and sub folders
- *
- * @param string $folder The local path to parse
- * @param array $fileTypes The type of files to get
- *
- * @return void
- *
- */
- public static function getAllFilePaths($folder, $fileTypes = array('\.php', '\.js', '\.css', '\.less'), $recurse = true, $full = true)
- {
- if (Folder::exists($folder))
- {
- // we must first store the current woking directory
- $joomla = getcwd();
- // we are changing the working directory to the component path
- chdir($folder);
- // make sure we have file type filter
- if (self::checkArray($fileTypes))
- {
- // get the files
- foreach ($fileTypes as $type)
- {
- // get a list of files in the current directory tree
- $files[] = Folder::files('.', $type, $recurse, $full);
- }
- }
- elseif (self::checkString($fileTypes))
- {
- // get a list of files in the current directory tree
- $files[] = Folder::files('.', $fileTypes, $recurse, $full);
- }
- else
- {
- // get a list of files in the current directory tree
- $files[] = Folder::files('.', '.', $recurse, $full);
- }
- // change back to Joomla working directory
- chdir($joomla);
- // return array of files
- return array_map( function($file) { return str_replace('./', '/', $file); }, (array) self::mergeArrays($files));
- }
- return false;
- }
-
/**
* get all component IDs
*/
@@ -3785,81 +3740,6 @@ abstract class ComponentbuilderHelper
return $exists;
}
- /**
- * Get the file path or url
- *
- * @param string $type The (url/path) type to return
- * @param string $target The Params Target name (if set)
- * @param string $fileType The kind of filename to generate (if not set no file name is generated)
- * @param string $key The key to adjust the filename (if not set ignored)
- * @param string $default The default path if not set in Params (fallback path)
- * @param bool $createIfNotSet The switch to create the folder if not found
- *
- * @return string On success the path or url is returned based on the type requested
- *
- */
- public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = '', $createIfNotSet = true)
- {
- // make sure to always have a string/path
- if(!self::checkString($default))
- {
- $default = JPATH_SITE . '/images/';
- }
- // get the global settings
- if (!self::checkObject(self::$params))
- {
- self::$params = JComponentHelper::getParams('com_componentbuilder');
- }
- $filePath = self::$params->get($target, $default);
- // check the file path (revert to default only of not a hidden file path)
- if ('hiddenfilepath' !== $target && strpos($filePath, JPATH_SITE) === false)
- {
- $filePath = $default;
- }
- // create the folder if it does not exist
- if ($createIfNotSet && !Folder::exists($filePath))
- {
- Folder::create($filePath);
- }
- // setup the file name
- $fileName = '';
- // Get basic key
- $basickey = 'Th!s_iS_n0t_sAfe_buT_b3tter_then_n0thiug';
- if (method_exists(get_called_class(), "getCryptKey"))
- {
- $basickey = self::getCryptKey('basic', $basickey);
- }
- // check the key
- if (!self::checkString($key))
- {
- $key = 'vDm';
- }
- // set the file name
- if (self::checkString($fileType))
- {
- // set the name
- $fileName = trim(md5($type.$target.$basickey.$key) . '.' . trim($fileType, '.'));
- }
- else
- {
- $fileName = trim(md5($type.$target.$basickey.$key)) . '.txt';
- }
- // return the url
- if ('url' === $type)
- {
- if (strpos($filePath, JPATH_SITE) !== false)
- {
- $filePath = trim( str_replace( JPATH_SITE, '', $filePath), '/');
- return JURI::root() . $filePath . '/' . $fileName;
- }
- // since the path is behind the root folder of the site, return only the root url (may be used to build the link)
- return JURI::root();
- }
- // sanitize the path
- return '/' . trim( $filePath, '/' ) . '/' . $fileName;
- }
-
-
/**
* Get the file path or url
*