blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-01 02:49:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011

Browse Source
This commit is contained in:
Paolo
2025-11-13 09:55:40 +01:00
parent e774787d67 3e303a6617
commit 7868c33c3d
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/ExtensionsLib.php
+11 -6
View File
@@ -115,11 +115,15 @@ class ExtensionsLib
$uploadData = $this->_uploadExtension(); // perform the upload of the file and returns info about it
}
// If the given filename is the upper directory or the current one
if (trim($uploadData->fullPath) == '..' || trim($uploadData->fullPath) == '.')
// If a file has been uploaded
if (isset($uploadData))
{
$this->_printFailure('wrong file name: / has to be escaped with %2F');
$uploadData = null; // then it is a wrong one!
// If the given filename is the upper directory or the current one
if (trim($uploadData->fullPath) == '..' || trim($uploadData->fullPath) == '.')
{
$this->_printFailure('wrong file name: / has to be escaped with %2F');
$uploadData = null; // then it is a wrong one!
}
}
// If the no error occurred
@@ -187,7 +191,8 @@ class ExtensionsLib
if ($this->_errorOccurred === false) // if no errors occurred
{
if (!$this->_rrm($uploadData->fullPath)) // removes uploaded file
// If a file has been uploaded then remove them
if (isset($uploadData) && !$this->_rrm($uploadData->fullPath))
{
$this->_printInfo('Error while cleaning upload directory. Not a blocking error');
}
@@ -253,7 +258,7 @@ class ExtensionsLib
$this->_ci->ExtensionsModel->addOrder('server_kurzbz', 'ASC');
$this->_ci->ExtensionsModel->addOrder('version', 'ASC');
return $this->_ci->ExtensionsModel->load();
return $this->_ci->ExtensionsModel->loadWhere(array('server_kurzbz' => SERVER_NAME));
}
/**