diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 41eeeac..0ca2990 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -52,4 +52,6 @@ license, including: Font Awesome - @davegandy - Nestable jQuery Plugin - Copyright (c) 2012 David Bushell \ No newline at end of file + Nestable jQuery Plugin - Copyright (c) 2012 David Bushell + + DataTables - Copyright (C) 2008-2021, SpryMedia Ltd. \ No newline at end of file diff --git a/system/admin/admin.php b/system/admin/admin.php index 7d81e62..e363f58 100644 --- a/system/admin/admin.php +++ b/system/admin/admin.php @@ -828,62 +828,6 @@ function edit_frontpage($title, $content) } } -// Move folder and files -function copy_folders($oldfolder, $newfolder) -{ - if (is_dir($oldfolder)) - { - $dir = opendir($oldfolder); - if (!is_dir($newfolder)) - { - mkdir($newfolder, 0775, true); - } - while (($file = readdir($dir))) - { - if (($file != '.') && ($file != '..')) - { - if (is_dir($oldfolder . '/' . $file)) - { - copy_folders($oldfolder . '/' . $file, $newfolder . '/' . $file); - } - else - { - copy($oldfolder . '/' . $file, $newfolder . '/' . $file); - } - } - } - closedir($dir); - } -} - - -// Delete folder and files -function remove_folders($dir) -{ - if (false === file_exists($dir)) { - return false; - } - - $files = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS), - RecursiveIteratorIterator::CHILD_FIRST - ); - - foreach ($files as $fileinfo) { - if ($fileinfo->isDir()) { - if (false === rmdir($fileinfo->getRealPath())) { - return false; - } - } else { - if (false === unlink($fileinfo->getRealPath())) { - return false; - } - } - } - - return rmdir($dir); -} - // Delete author function delete_author($file, $destination) { diff --git a/system/includes/dispatch.php b/system/includes/dispatch.php index 4902e32..15e10f5 100644 --- a/system/includes/dispatch.php +++ b/system/includes/dispatch.php @@ -136,6 +136,61 @@ if (extension_loaded('mcrypt')) { } +// Move folder and files +function copy_folders($oldfolder, $newfolder) +{ + if (is_dir($oldfolder)) + { + $dir = opendir($oldfolder); + if (!is_dir($newfolder)) + { + mkdir($newfolder, 0775, true); + } + while (($file = readdir($dir))) + { + if (($file != '.') && ($file != '..')) + { + if (is_dir($oldfolder . '/' . $file)) + { + copy_folders($oldfolder . '/' . $file, $newfolder . '/' . $file); + } + else + { + copy($oldfolder . '/' . $file, $newfolder . '/' . $file); + } + } + } + closedir($dir); + } +} + +// Delete folder and files +function remove_folders($dir) +{ + if (false === file_exists($dir)) { + return false; + } + + $files = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS), + RecursiveIteratorIterator::CHILD_FIRST + ); + + foreach ($files as $fileinfo) { + if ($fileinfo->isDir()) { + if (false === rmdir($fileinfo->getRealPath())) { + return false; + } + } else { + if (false === unlink($fileinfo->getRealPath())) { + return false; + } + } + } + + return rmdir($dir); +} + // Based on // HTML Minifier function minify_html($input) {