From 2ce8352641a667e83331510403703661eef7765b Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Mon, 4 Feb 2019 08:07:09 +0100 Subject: [PATCH 1/6] fix stubGenerator --- .../Support/{Stringcontroller.php => StringcController.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename libraries/src/Filesystem/Support/{Stringcontroller.php => StringcController.php} (100%) diff --git a/libraries/src/Filesystem/Support/Stringcontroller.php b/libraries/src/Filesystem/Support/StringcController.php similarity index 100% rename from libraries/src/Filesystem/Support/Stringcontroller.php rename to libraries/src/Filesystem/Support/StringcController.php From 45b355009ca8a57389424dfb257d1194d3b68c9c Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Mon, 4 Feb 2019 08:28:50 +0100 Subject: [PATCH 2/6] less c --- .../Support/{StringcController.php => StringController.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename libraries/src/Filesystem/Support/{StringcController.php => StringController.php} (100%) diff --git a/libraries/src/Filesystem/Support/StringcController.php b/libraries/src/Filesystem/Support/StringController.php similarity index 100% rename from libraries/src/Filesystem/Support/StringcController.php rename to libraries/src/Filesystem/Support/StringController.php From 1a08a03ae2b7593cd3ecb5a6175f253ab5ee448c Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Tue, 12 Feb 2019 19:50:31 +0100 Subject: [PATCH 3/6] realpath --- administrator/components/com_admin/script.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index ef7e1da1a2125..0302e45d2b6bf 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2250,13 +2250,15 @@ public function deleteUnexistingFiles() '/libraries/joomla/filesystem/support', '/libraries/joomla/filesystem/wrapper', '/libraries/joomla/filesystem', + // Joomla! 3.9.4 + 'libraries/src/Filesystem/Support/Stringcontroller.php', ); jimport('joomla.filesystem.file'); foreach ($files as $file) { - if (JFile::exists(JPATH_ROOT . $file) && !JFile::delete(JPATH_ROOT . $file)) + if (JFile::exists(realpath(JPATH_ROOT . $file)) && !JFile::delete(realpath(JPATH_ROOT . $file))) { echo JText::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $file) . '
'; } From f9b2030ab356bdf782a6e03e38bce268123f0100 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Tue, 12 Feb 2019 19:51:21 +0100 Subject: [PATCH 4/6] slash --- administrator/components/com_admin/script.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 0302e45d2b6bf..84a09acba1e24 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2251,7 +2251,7 @@ public function deleteUnexistingFiles() '/libraries/joomla/filesystem/wrapper', '/libraries/joomla/filesystem', // Joomla! 3.9.4 - 'libraries/src/Filesystem/Support/Stringcontroller.php', + '/libraries/src/Filesystem/Support/Stringcontroller.php', ); jimport('joomla.filesystem.file'); From df74d7d1a541b10cbb401881308222c9db639ef8 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Tue, 12 Feb 2019 19:57:28 +0100 Subject: [PATCH 5/6] wrong place --- administrator/components/com_admin/script.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 84a09acba1e24..7c4d149642591 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -1983,6 +1983,8 @@ public function deleteUnexistingFiles() '/libraries/joomla/filesystem/wrapper/path.php', '/libraries/src/Mail/language/phpmailer.lang-joomla.php', '/plugins/captcha/recaptcha/recaptchalib.php', + // Joomla! 3.9.4 + '/libraries/src/Filesystem/Support/Stringcontroller.php', /* * Legacy FOF @@ -2250,8 +2252,6 @@ public function deleteUnexistingFiles() '/libraries/joomla/filesystem/support', '/libraries/joomla/filesystem/wrapper', '/libraries/joomla/filesystem', - // Joomla! 3.9.4 - '/libraries/src/Filesystem/Support/Stringcontroller.php', ); jimport('joomla.filesystem.file'); From d6f533e5c6b4d37dd9dd20180640ec6d2611719c Mon Sep 17 00:00:00 2001 From: Harald Date: Tue, 12 Feb 2019 20:20:31 +0100 Subject: [PATCH 6/6] Update administrator/components/com_admin/script.php memo: don't write code on train Co-Authored-By: alikon --- administrator/components/com_admin/script.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 7c4d149642591..592e7afa099db 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2258,7 +2258,7 @@ public function deleteUnexistingFiles() foreach ($files as $file) { - if (JFile::exists(realpath(JPATH_ROOT . $file)) && !JFile::delete(realpath(JPATH_ROOT . $file))) + if (realpath(JPATH_ROOT . $file) === JPATH_ROOT . $file && !JFile::delete(JPATH_ROOT . $file)) { echo JText::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $file) . '
'; }