mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-10905 iterating correctly with readdir (as shown in php doc)

Browse Source
This commit is contained in:
nicolasconnault 2007-10-15 05:18:58 +00:00
parent 546526ed42
commit ed818bbdbf
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/delete.php
View File

@ -54,7 +54,7 @@ function delete_subdirectories($rootdir) {
$dir = opendir($rootdir);
while ($file = readdir($dir)) {
while (false !== ($file = readdir($dir))) {
if ($file != '.' and $file != '..') {
$fullfile = $rootdir .'/'. $file;
if (filetype($fullfile) == 'dir') {

2
backup/bb/restore_bb.php
View File

@ -9,7 +9,7 @@ require_once($CFG->dirroot.'/backup/bb/xsl_emulate_xslt.inc');
function get_subdirs($directory){
$opendirectory = opendir( $directory );
while($filename = readdir($opendirectory)) {
while(false !== ($filename = readdir($opendirectory))) {
if (is_dir($directory.$filename) and $filename != ".." and $filename != "."){
$subdirs[] = $filename;
}

8
backup/lib.php
View File

@ -125,7 +125,7 @@
}
// Loop through all directory entries, and construct two temporary arrays containing files and sub directories
while($entry = readdir($handle)) {
while(false !== ($entry = readdir($handle))) {
if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) {
$dir_subdirs[] = $dir. $slash .$entry;
}
@ -202,7 +202,7 @@
$results = null;
$dir = opendir($rootdir);
while ($file=readdir($dir)) {
while (false !== ($file=readdir($dir))) {
if ($file=="." || $file=="..") {
continue;
}
@ -221,7 +221,7 @@
$results = "";
$dir = opendir($rootdir);
while ($file=readdir($dir)) {
while (false !== ($file=readdir($dir))) {
if ($file=="." || $file=="..") {
continue;
}
@ -308,7 +308,7 @@
$status = check_dir_exists($to_file, true, true);
}
$dir = opendir($from_file);
while ($file=readdir($dir)) {
while (false !== ($file=readdir($dir))) {
if ($file=="." || $file=="..") {
continue;
}

2
mod/assignment/db/mysql.php
View File

@ -62,7 +62,7 @@ function assignment_upgrade($oldversion) {
notify("Moving location of assignment files...");
$basedir = opendir("$CFG->dataroot");
while ($dir = readdir($basedir)) {
while (false !== ($dir = readdir($basedir))) {
if ($dir == "." || $dir == ".." || $dir == "users") {
continue;
}

2
mod/assignment/db/postgres7.php
View File

@ -60,7 +60,7 @@ function assignment_upgrade($oldversion) {
notify("Moving location of assignment files...");
$basedir = opendir("$CFG->dataroot");
while ($dir = readdir($basedir)) {
while (false !== ($dir = readdir($basedir))) {
if ($dir == "." || $dir == ".." || $dir == "users") {
continue;
}

2
mod/hotpot/lib.php
View File

@ -472,7 +472,7 @@ function hotpot_add_chain(&$hotpot) {
// get list of hotpot files in this folder
if ($dh = @opendir($xml_quiz->filepath)) {
while ($file = @readdir($dh)) {
while (false !== ($file = @readdir($dh))) {
if (preg_match('/\.(jbc|jcl|jcw|jmt|jmx|jqz|htm|html)$/', $file)) {
$hotpot->references[] = "$xml_quiz->reference/$file";
}

2
mod/resource/type/ims/finder.php
View File

@ -30,7 +30,7 @@
/// Loops though dir building a list of all relevent entries. Ignores files.
/// Asks for deploy if admin user AND no serialized file found.
while (false != ($filename = readdir($repository_dir))) {
while (false !== ($filename = readdir($repository_dir))) {
if ($filename != '.' && $filename != '..' && is_dir("$CFG->repository/$directory/$filename")) {
unset($item);
$item->type = '';

4
mod/resource/type/ims/repository_deploy.php
View File

@ -7,7 +7,7 @@
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com //
// Copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com //
// (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com //
// //
// This program is free software; you can redistribute it and/or modify //
@ -68,7 +68,7 @@
$dirpath = "$CFG->repository/$file";
$dir = opendir($dirpath);
while (false != ($filename = readdir($dir))) {
while (false !== ($filename = readdir($dir))) {
if ($filename != '.' && $filename != '..') {
$path = $dirpath.'/'.$filename;
if (is_dir($path) && file_exists("$path/imsmanifest.xml")) {

2
mod/wiki/ewiki/ewiki.php
View File

@ -3189,7 +3189,7 @@ function ewiki_eventually_initialize(&$id, &$data, &$action) {
$path=EWIKI_INIT_PAGES;
if (!empty($path)) {
if ($dh = @opendir($path=EWIKI_INIT_PAGES)) {
while ($filename = readdir($dh)) {
while (false !== ($filename = readdir($dh))) {
#### MOODLE CHANGE TO SOLVE BUG #3830. Original doesn't support dots in names.
//Orig->if (preg_match('/^(['.EWIKI_CHARS_U.']+['.EWIKI_CHARS_L.']+\w*)+/', $filename)) {
if ($filename == clean_filename($filename) && !is_dir($path.'/'.$filename)) {

4
mod/wiki/ewiki/plugins/init.php
View File

@ -79,7 +79,7 @@ function ewiki_initialization_wizard($id, &$data, &$action) {
else {
ewiki_database("INIT", array());
if ($dh = @opendir($path=EWIKI_INIT_PAGES)) {
while ($filename = readdir($dh)) {
while (false !== ($filename = readdir($dh))) {
if (preg_match('/^(['.EWIKI_CHARS_U.']+['.EWIKI_CHARS_L.']+\w*)+/', $filename)) {
$found = ewiki_database("FIND", array($filename));
if (! $found[$filename]) {
@ -119,4 +119,4 @@ function ewiki_initialization_wizard($id, &$data, &$action) {
}
?>
?>

4
mod/wiki/ewiki/plugins/spages.php
View File

@ -141,7 +141,7 @@ function ewiki_init_spages($dirs, $idprep="") {
#-- read in one directory
$dh = opendir($dir);
while ($fn = readdir($dh)) {
while (false !== ($fn = readdir($dh))) {
#-- skip over . and ..
if ($fn[0] == ".") { continue; }
@ -179,4 +179,4 @@ function ewiki_init_spages($dirs, $idprep="") {
?>
?>

2
question/format/blackboard_6/format.php
View File

@ -60,7 +60,7 @@ class qformat_blackboard_6 extends qformat_default {
}
// Loop through all directory entries, and construct two temporary arrays containing files and sub directories
while($entry = readdir($handle)) {
while(false !== ($entry = readdir($handle))) {
if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != ".") {
$dir_subdirs[] = $dir. $slash .$entry;
}

2
question/format/coursetestmanager/format.php
View File

@ -434,7 +434,7 @@ class qformat_coursetestmanager extends qformat_default {
function fulldelete($location) {
if (is_dir($location)) {
$currdir = opendir($location);
while ($file = readdir($currdir)) {
while (false !== ($file = readdir($currdir))) {
if ($file <> ".." && $file <> ".") {
$fullfile = $location."/".$file;
if (is_dir($fullfile)) {