joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Adds gitea URL. Adds option to add changelog gh-813. Adds clone option to some areas. Fixed gh-784 to allow BASE64 filter selection.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2021-12-21 16:44:50 +02:00
parent 6beb6edf91
commit 53725a917d
1442 changed files with 6776 additions and 1922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
admin/helpers/componentbuilder.php
View File

@ -4,6 +4,7 @@
*
* @created 30th April, 2015
* @author Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
* @gitea Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
* @github Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
* @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
@ -788,6 +789,33 @@ abstract class ComponentbuilderHelper
return self::safeString($string);
}
/**
* Making namespace safe
*
* @input string The you would like to make safe
*
* @returns string on success
**/
public static function safeNamespace($string)
{
// 0nly continue if we have a string
if (self::checkString($string))
{
// make sure it has not numbers
$string = self::replaceNumbers($string);
// Transliterate string TODO: look again as this make it lowercase
// $string = self::transliterate($string);
// first remove all [\] backslashes
$string = str_replace('\\', '1', $string);
// remove all and keep only characters and [\] backslashes inside of the string
$string = trim(preg_replace("/[^A-Za-z1]/", '', $string), '1');
// place the [\] backslashes back
return trim(preg_replace("/1+/", '\\', $string));
}
// not a string
return '';
}
/*
* Get the Array of Existing Validation Rule Names
*
@ -4484,8 +4512,10 @@ abstract class ComponentbuilderHelper
// use the SFTP protocol
elseif (2 == $server->jcb_protocol)
{
// get the remote path
$remote_path = '/' . trim($server->jcb_remote_server_path[(int) $serverID], '/') . '/' . $fileName;
// now move the file
if (!$server->put($server->jcb_remote_server_path[(int) $serverID] . $fileName, self::getFileContents($localPath, null)))
if (!$server->put($remote_path, self::getFileContents($localPath, null)))
{
JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_PATH_ON_BSB_SERVER', $fileName, $server->jcb_remote_server_path[(int) $serverID], $server->jcb_remote_server_name[(int) $serverID]), 'Error');
return false;
@ -4561,7 +4591,7 @@ abstract class ComponentbuilderHelper
return false;
}
// insure the port is set
$server->port = (isset($server->port) && is_int($server->port) && $server->port > 0) ? $server->port : 22;
$server->port = (isset($server->port) && is_numeric($server->port) && $server->port > 0) ? (int) $server->port : 22;
// open the connection
self::$sftp[$server->cache] = new phpseclib\Net\SFTP($server->host, $server->port);
// heads-up on protocol