diff --git a/src/administrator/components/com_kunena/controllers/templates.php b/src/administrator/components/com_kunena/controllers/templates.php index 40c92f3bc8..95303d67e0 100644 --- a/src/administrator/components/com_kunena/controllers/templates.php +++ b/src/administrator/components/com_kunena/controllers/templates.php @@ -18,6 +18,7 @@ use Joomla\CMS\Session\Session; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; /** * Kunena Backend Templates Controller @@ -234,10 +235,10 @@ public function install() File::move($dest . $template->directory . '/assets/css/custom.css', $tmp_kunena . $template->sourcedir . '/assets/css/custom.css'); } - KunenaFolder::delete($dest . $template->directory); + Folder::delete($dest . $template->directory); } - $success = KunenaFolder::move($tmp_kunena . $template->sourcedir, $dest . $template->directory); + $success = Folder::move($tmp_kunena . $template->sourcedir, $dest . $template->directory); if ($success !== true) { @@ -252,7 +253,7 @@ public function install() // Delete the tmp install directory if (is_dir($tmp_kunena)) { - KunenaFolder::delete($tmp_kunena); + Folder::delete($tmp_kunena); } // Clear all cache, just in case. @@ -327,7 +328,7 @@ public function uninstall() // Delete the template directory if (is_dir($tpl)) { - $retval = KunenaFolder::delete($tpl); + $retval = Folder::delete($tpl); // Clear all cache, just in case. KunenaCacheHelper::clearAll(); diff --git a/src/administrator/components/com_kunena/models/categories.php b/src/administrator/components/com_kunena/models/categories.php index c1d5d2a743..3475f34aa3 100644 --- a/src/administrator/components/com_kunena/models/categories.php +++ b/src/administrator/components/com_kunena/models/categories.php @@ -15,6 +15,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\Registry\Registry; +use Joomla\CMS\Filesystem\Folder; jimport('joomla.application.component.model'); jimport('joomla.html.pagination'); @@ -145,7 +146,7 @@ public function getAdminOptions() $lists['display_children'] = HTMLHelper::_('select.genericlist', $options, 'params[display][index][children]', 'class="inputbox" size="1"', 'value', 'text', $category->params->get('display.index.children', '3')); $topicicons = array(); - $topiciconslist = KunenaFolder::folders(JPATH_ROOT . '/media/kunena/topic_icons'); + $topiciconslist = Folder::folders(JPATH_ROOT . '/media/kunena/topic_icons'); foreach ($topiciconslist as $icon) { diff --git a/src/administrator/components/com_kunena/models/rank.php b/src/administrator/components/com_kunena/models/rank.php index d400f7c0dc..569a5ac9a5 100644 --- a/src/administrator/components/com_kunena/models/rank.php +++ b/src/administrator/components/com_kunena/models/rank.php @@ -13,6 +13,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; jimport('joomla.application.component.modellist'); @@ -36,7 +37,7 @@ public function getRankspaths() $selected = $this->getRank(); $rankpath = $template->getRankPath(); - $files1 = (array) KunenaFolder::Files(JPATH_SITE . '/' . $rankpath, false, false, false, array('index.php', 'index.html')); + $files1 = (array) Folder::Files(JPATH_SITE . '/' . $rankpath, false, false, false, array('index.php', 'index.html')); $files1 = (array) array_flip($files1); foreach ($files1 as $key => &$path) @@ -45,7 +46,7 @@ public function getRankspaths() } $rankpath = 'media/kunena/ranks/'; - $files2 = (array) KunenaFolder::Files(JPATH_SITE . '/' . $rankpath, false, false, false, array('index.php', 'index.html')); + $files2 = (array) Folder::Files(JPATH_SITE . '/' . $rankpath, false, false, false, array('index.php', 'index.html')); $files2 = (array) array_flip($files2); foreach ($files2 as $key => &$path) diff --git a/src/administrator/components/com_kunena/models/smiley.php b/src/administrator/components/com_kunena/models/smiley.php index 4a9e508905..9440e02391 100644 --- a/src/administrator/components/com_kunena/models/smiley.php +++ b/src/administrator/components/com_kunena/models/smiley.php @@ -13,6 +13,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; jimport('joomla.application.component.modellist'); @@ -35,7 +36,7 @@ public function getSmileyspaths() $selected = $this->getSmiley(); $smileypath = $template->getSmileyPath(); - $files1 = (array) KunenaFolder::Files(JPATH_SITE . '/' . $smileypath, false, false, false, array('index.php', 'index.html')); + $files1 = (array) Folder::Files(JPATH_SITE . '/' . $smileypath, false, false, false, array('index.php', 'index.html')); $files1 = (array) array_flip($files1); foreach ($files1 as $key => &$path) @@ -44,7 +45,7 @@ public function getSmileyspaths() } $smileypath = 'media/kunena/emoticons/'; - $files2 = (array) KunenaFolder::Files(JPATH_SITE . '/' . $smileypath, false, false, false, array('index.php', 'index.html')); + $files2 = (array) Folder::Files(JPATH_SITE . '/' . $smileypath, false, false, false, array('index.php', 'index.html')); $files2 = (array) array_flip($files2); foreach ($files2 as $key => &$path) diff --git a/src/administrator/components/com_kunena/models/tools.php b/src/administrator/components/com_kunena/models/tools.php index 52684d81b6..e0c48e7905 100644 --- a/src/administrator/components/com_kunena/models/tools.php +++ b/src/administrator/components/com_kunena/models/tools.php @@ -15,6 +15,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Filesystem\Folder; jimport('joomla.application.component.model'); require_once __DIR__ . '/cpanel.php'; @@ -327,7 +328,7 @@ protected function getReportData() } else { - $this->mbstring = '[u]mbstring:[/u] ❌ [color=#FF0000]Not installed[/color]'; + $this->mbstring = '[u]mbstring:[/u] â�Œ [color=#FF0000]Not installed[/color]'; } if (extension_loaded('gd')) @@ -337,7 +338,7 @@ protected function getReportData() } else { - $this->gd_support = '[u]GD:[/u] ❌ [color=#FF0000]Not installed[/color]'; + $this->gd_support = '[u]GD:[/u] â�Œ [color=#FF0000]Not installed[/color]'; } $this->maxExecTime = ini_get('max_execution_time'); @@ -608,7 +609,7 @@ protected function _getTablesCollation() { if (!empty($row->Collation) && !preg_match('`utf8`', $row->Collation)) { - $collation .= $table . ' ❌ [color=#FF0000]have wrong collation of type ' . $row->Collation . ' [/color] on field ' . $row->Field . ' '; + $collation .= $table . ' â�Œ [color=#FF0000]have wrong collation of type ' . $row->Collation . ' [/color] on field ' . $row->Field . ' '; } } } @@ -618,7 +619,7 @@ protected function _getTablesCollation() { if (!empty($row->Collation) && !preg_match('`utf8`', $row->Collation)) { - $collation .= $table . ' ❌ [color=#FF0000]have wrong collation of type ' . $row->Collation . ' [/color] on field ' . $row->Field . ' '; + $collation .= $table . ' â�Œ [color=#FF0000]have wrong collation of type ' . $row->Collation . ' [/color] on field ' . $row->Field . ' '; } } } @@ -628,7 +629,7 @@ protected function _getTablesCollation() if (empty($collation)) { - $collation = '✔ The collation of your table fields are correct'; + $collation = '✔ The collation of your table fields are correct'; } return $collation; @@ -742,7 +743,7 @@ public function findExtensionVersion($path) elseif (is_dir($path)) { // Get an array of all the XML files from the directory - $xmlfiles = KunenaFolder::files($path, '\.xml$', 1, true); + $xmlfiles = Folder::files($path, '\.xml$', 1, true); } $version = null; diff --git a/src/components/com_kunena/controller/user/edit/avatar/display.php b/src/components/com_kunena/controller/user/edit/avatar/display.php index cde6f88ecb..30c27501c2 100644 --- a/src/components/com_kunena/controller/user/edit/avatar/display.php +++ b/src/components/com_kunena/controller/user/edit/avatar/display.php @@ -14,6 +14,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Filesystem\Folder; /** * Class ComponentKunenaControllerUserEditAvatarDisplay @@ -126,7 +127,7 @@ protected function getGalleries($path) } // TODO: Allow recursive paths. - $folders = KunenaFolder::folders($path); + $folders = Folder::folders($path); foreach ($folders as $folder) { @@ -154,7 +155,7 @@ protected function getGalleries($path) */ protected function getGallery($path) { - return KunenaFolder::files($path, $this->imageFilter); + return Folder::files($path, $this->imageFilter); } /** diff --git a/src/components/com_kunena/controllers/user.php b/src/components/com_kunena/controllers/user.php index 96935f752f..175e326089 100644 --- a/src/components/com_kunena/controllers/user.php +++ b/src/components/com_kunena/controllers/user.php @@ -20,6 +20,7 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Table\Table; use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; /** * Kunena User Controller @@ -1065,7 +1066,7 @@ protected function deleteOldAvatars() // Delete old uploaded avatars: if (is_dir(KPATH_MEDIA . '/avatars/resized')) { - $deletelist = KunenaFolder::folders(KPATH_MEDIA . '/avatars/resized', '.', false, true); + $deletelist = Folder::folders(KPATH_MEDIA . '/avatars/resized', '.', false, true); foreach ($deletelist as $delete) { diff --git a/src/components/com_kunena/layout/topic/edit/editor.php b/src/components/com_kunena/layout/topic/edit/editor.php index e70faa793a..366a670bd2 100644 --- a/src/components/com_kunena/layout/topic/edit/editor.php +++ b/src/components/com_kunena/layout/topic/edit/editor.php @@ -12,6 +12,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Filesystem\Folder; /** * KunenaLayoutTopicEditEditor @@ -46,7 +47,7 @@ public function getCodeTypes() continue; } - $files = KunenaFolder::files($path, ".php"); + $files = Folder::files($path, ".php"); $options = array(); $options[] = HTMLHelper::_('select.option', '', Text::_('COM_KUNENA_EDITOR_CODE_TYPE')); diff --git a/src/components/com_kunena/layout/widget/editor.php b/src/components/com_kunena/layout/widget/editor.php index 92105a1c2e..9229fbeec2 100644 --- a/src/components/com_kunena/layout/widget/editor.php +++ b/src/components/com_kunena/layout/widget/editor.php @@ -12,6 +12,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Filesystem\Folder; /** * KunenaLayoutTopicEditEditor @@ -48,7 +49,7 @@ public function getCodeTypes() continue; } - $files = KunenaFolder::files($path, ".php"); + $files = Folder::files($path, ".php"); $options = array(); $options[] = HTMLHelper::_('select.option', '', Text::_('COM_KUNENA_EDITOR_CODE_TYPE')); diff --git a/src/libraries/kunena/attachment/attachment.php b/src/libraries/kunena/attachment/attachment.php index e5373d04cc..e2050b66b6 100644 --- a/src/libraries/kunena/attachment/attachment.php +++ b/src/libraries/kunena/attachment/attachment.php @@ -754,7 +754,7 @@ public function saveFile($source, $basename = null, $extension = null, $unlink = } // Create target directory if it does not exist. - if (!KunenaFolder::exists(JPATH_ROOT . "/{$this->folder}") && !KunenaFolder::create(JPATH_ROOT . "/{$this->folder}")) + if (!Folder::exists(JPATH_ROOT . "/{$this->folder}") && !Folder::create(JPATH_ROOT . "/{$this->folder}")) { throw new RuntimeException(Text::_('Failed to create attachment directory.')); } diff --git a/src/libraries/kunena/cache/helper.php b/src/libraries/kunena/cache/helper.php index 82ebe86bcf..9099761956 100644 --- a/src/libraries/kunena/cache/helper.php +++ b/src/libraries/kunena/cache/helper.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die(); use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; /** * Class KunenaCacheHelper has helper functions to clear all caches that affects Kunena. @@ -96,10 +97,10 @@ public static function clearCacheFiles() if (is_dir($cacheDir)) { - KunenaFolder::delete($cacheDir); + Folder::delete($cacheDir); } - KunenaFolder::create($cacheDir); + Folder::create($cacheDir); } /** @@ -114,10 +115,10 @@ public static function clearTemplateFiles() if (is_dir($cacheDir)) { - KunenaFolder::delete($cacheDir); + Folder::delete($cacheDir); } - KunenaFolder::create($cacheDir); + Folder::create($cacheDir); } /** diff --git a/src/libraries/kunena/file/file.php b/src/libraries/kunena/file/file.php index a559315bea..85877fe7dc 100644 --- a/src/libraries/kunena/file/file.php +++ b/src/libraries/kunena/file/file.php @@ -10,15 +10,12 @@ **/ defined('_JEXEC') or die; -jimport('joomla.filesystem.file'); - /** * Class KunenaFile * - * @see JFile * @since Kunena */ -class KunenaFile extends JFile +class KunenaFile { /** * @param string $file file diff --git a/src/libraries/kunena/image/helper.php b/src/libraries/kunena/image/helper.php index 96f6b754e7..c4216f60d6 100644 --- a/src/libraries/kunena/image/helper.php +++ b/src/libraries/kunena/image/helper.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; /** * Helper class for image manipulation. @@ -38,7 +39,7 @@ public static function version($file, $folder, $filename, $maxWidth = 800, $maxH try { // Create target directory if it does not exist. - if (!KunenaFolder::exists($folder) && !KunenaFolder::create($folder)) + if (!Folder::exists($folder) && !Folder::create($folder)) { return false; } diff --git a/src/libraries/kunena/template/helper.php b/src/libraries/kunena/template/helper.php index 5b3b6a0c86..cca8602bb9 100644 --- a/src/libraries/kunena/template/helper.php +++ b/src/libraries/kunena/template/helper.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die(); use Joomla\CMS\Language\Text; +use Joomla\CMS\Filesystem\Folder; /** * Kunena Template Helper Class @@ -74,7 +75,7 @@ public static function parseXmlFiles($templateBaseDir = null) return array('' => $data); } - $templateDirs = KunenaFolder::folders($templateBaseDir); + $templateDirs = Folder::folders($templateBaseDir); $rows = array(); // Check that the directory contains an xml file diff --git a/src/libraries/kunena/template/template.php b/src/libraries/kunena/template/template.php index 3e9afd40b5..841bdcd386 100644 --- a/src/libraries/kunena/template/template.php +++ b/src/libraries/kunena/template/template.php @@ -19,6 +19,7 @@ use Leafo\ScssPhp\Compiler; use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; jimport('joomla.html.parameter'); @@ -909,7 +910,7 @@ public function clearCache() if (is_dir($path)) { - KunenaFolder::delete($path); + Folder::delete($path); } } @@ -1741,7 +1742,7 @@ public function compileLess($inputFile, $outputFile) if (!is_dir($cacheDir)) { - KunenaFolder::create($cacheDir); + Folder::create($cacheDir); } $cacheFile = "{$cacheDir}/kunena.{$this->name}.{$inputFile}.cache"; @@ -1759,7 +1760,7 @@ public function compileLess($inputFile, $outputFile) if (!is_dir($outputDir)) { - KunenaFolder::create($outputDir); + Folder::create($outputDir); } $outputFile = "{$outputDir}/{$outputFile}"; @@ -1801,7 +1802,7 @@ public function compileScss($inputFile, $outputFile) if (!is_dir($cacheDir)) { - KunenaFolder::create($cacheDir); + Folder::create($cacheDir); } $cacheFile = "{$cacheDir}/kunena.{$this->name}.{$inputFile}.cache"; @@ -1819,7 +1820,7 @@ public function compileScss($inputFile, $outputFile) if (!is_dir($outputDir)) { - KunenaFolder::create($outputDir); + Folder::create($outputDir); } $outputFile = "{$outputDir}/{$outputFile}"; diff --git a/src/libraries/kunena/upload/upload.php b/src/libraries/kunena/upload/upload.php index 0f9b252177..d39d58d5c0 100644 --- a/src/libraries/kunena/upload/upload.php +++ b/src/libraries/kunena/upload/upload.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; defined('_JEXEC') or die; @@ -133,7 +134,7 @@ public function ajaxUpload(array $options) $folder = $this->getFolder(); // Create target directory if it does not exist. - if (!KunenaFolder::exists($folder) && !KunenaFolder::create($folder)) + if (!Folder::exists($folder) && !Folder::create($folder)) { throw new RuntimeException(Text::_('Failed to create upload directory.'), 500); }