tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now in the function 'filemanager_read_recursive_dir' returns the directories 

(cherry picked from commit ae97ad964d)

Conflicts:
	pandora_console/include/functions_filemanager.php
This commit is contained in:
mdtrooper 2015-06-09 15:53:25 +02:00
parent 0eafdac3ff
commit 458d9909d4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandora_console/include/functions_filemanager.php
View File

@ -430,7 +430,7 @@ function filemanager_delete_directory($dir) {
* *
* @return array The files in the dirs, empty array for empty dir of files. * @return array The files in the dirs, empty array for empty dir of files.
*/ */
function filemanager_read_recursive_dir($dir, $relative_path = '') { function filemanager_read_recursive_dir($dir, $relative_path = '', $add_empty_dirs = false) {
$return = array(); $return = array();
// Windows compatibility // Windows compatibility
@ -442,10 +442,21 @@ function filemanager_read_recursive_dir($dir, $relative_path = '') {
while (false !== ($entry = readdir($handle))) { while (false !== ($entry = readdir($handle))) {
if (($entry != ".") && ($entry != "..")) { if (($entry != ".") && ($entry != "..")) {
if (is_dir($dir . $entry)) { if (is_dir($dir . $entry)) {
$return = array_merge($return, filemanager_read_recursive_dir($dir . $entry . '/', $relative_path . $entry . '/' )); $return[] = array(
'relative' => $relative_path . $entry,
'absolute' => $dir . $entry,
'dir' => true);
$return = array_merge($return,
filemanager_read_recursive_dir(
$dir . $entry . '/', $relative_path . $entry . '/',
'', $add_empty_dirs));
} }
else { else {
$return[] = array('relative' => $relative_path . $entry, 'absolute' => $dir . $entry); $return[] = array(
'relative' => $relative_path . $entry,
'absolute' => $dir . $entry,
'dir' => false);
} }
} }
} }
@ -540,6 +551,8 @@ function filemanager_file_explorer($real_directory, $relative_directory,
$files = filemanager_list_dir ($real_directory); $files = filemanager_list_dir ($real_directory);
$table = new stdClass();
$table->width = '98%';
$table->id = 'table_filemanager'; $table->id = 'table_filemanager';
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
$table->width = '100%'; $table->width = '100%';