L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-33857 fixed up whitespace

Browse Source
This commit is contained in:
Sam Hemelryk
2012-10-16 13:32:46 +08:00
parent 4740c0a64f
commit 1ffbad6404
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filebrowser/file_info.php
+9 -9
View File
@@ -115,7 +115,7 @@ abstract class file_info {
$likes[] = $DB->sql_like($prefix.'filename', ':filename'.$cnt, false);
$params['filename'.$cnt] = '%'.$ext;
}
$sql .= ' AND ('.join(' OR ', $likes).')';
$sql .= ' AND (' . join(' OR ', $likes) . ')';
}
return array($sql, $params);
}
@@ -144,7 +144,7 @@ abstract class file_info {
} else {
$filename = $fileinfo->get_visible_name();
$extension = textlib::strtolower(pathinfo($filename, PATHINFO_EXTENSION));
if (!empty($extension) && in_array('.'.$extension, $extensions)) {
if (!empty($extension) && in_array('.' . $extension, $extensions)) {
$nonemptylist[] = $fileinfo;
}
}
@@ -178,7 +178,7 @@ abstract class file_info {
if ($extensions !== '*') {
$filename = $fileinfo->get_visible_name();
$extension = textlib::strtolower(pathinfo($filename, PATHINFO_EXTENSION));
if (empty($extension) || !in_array('.'.$extension, $extensions)) {
if (empty($extension) || !in_array('.' . $extension, $extensions)) {
continue;
}
}
@@ -213,12 +213,12 @@ abstract class file_info {
public function get_params_rawencoded() {
$params = $this->get_params();
$encoded = array();
$encoded[] = 'contextid='.$params['contextid'];
$encoded[] = 'component='.$params['component'];
$encoded[] = 'filearea='.$params['filearea'];
$encoded[] = 'itemid='.(is_null($params['itemid']) ? -1 : $params['itemid']);
$encoded[] = 'filepath='.(is_null($params['filepath']) ? '' : rawurlencode($params['filepath']));
$encoded[] = 'filename='.((is_null($params['filename']) or $params['filename'] === '.') ? '' : rawurlencode($params['filename']));
$encoded[] = 'contextid=' . $params['contextid'];
$encoded[] = 'component=' . $params['component'];
$encoded[] = 'filearea=' . $params['filearea'];
$encoded[] = 'itemid=' . (is_null($params['itemid']) ? -1 : $params['itemid']);
$encoded[] = 'filepath=' . (is_null($params['filepath']) ? '' : rawurlencode($params['filepath']));
$encoded[] = 'filename=' . ((is_null($params['filename']) or $params['filename'] === '.') ? '' : rawurlencode($params['filename']));
return $encoded;
}
lib/filebrowser/file_info_context_course.php
+2 -2
View File
@@ -376,7 +376,7 @@ class file_info_context_course extends file_info {
if ($child = $this->get_file_info($area[0], $area[1], 0, '/', '.')) {
if ($returnemptyfolders || $child->count_non_empty_children($extensions)) {
$children[] = $child;
if (($countonly !== false) && count($children)>=$countonly) {
if (($countonly !== false) && count($children) >= $countonly) {
return $countonly;
}
}
@@ -397,7 +397,7 @@ class file_info_context_course extends file_info {
if ($child = $this->browser->get_file_info($modcontext)) {
if ($returnemptyfolders || $child->count_non_empty_children($extensions)) {
$children[] = $child;
if (($countonly !== false) && count($children)>=$countonly) {
if (($countonly !== false) && count($children) >= $countonly) {
return $countonly;
}
}
lib/filebrowser/file_info_context_module.php
+1 -1
View File
@@ -280,7 +280,7 @@ class file_info_context_module extends file_info {
array('mod_'.$this->modname, 'intro'),
array('backup', 'activity')
);
foreach ($this->areas as $area=>$desctiption) {
foreach ($this->areas as $area => $desctiption) {
$areas[] = array('mod_'.$this->modname, $area);
}
mod/workshop/fileinfolib.php
+1 -1
View File
@@ -98,7 +98,7 @@ class workshop_file_info_submissions_container extends file_info {
}
/**
* Help function to return files matching extensions or their count
* Helper function to return files matching extensions or their count
*
* @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg')
* @param bool|int $countonly if false returns the children, if an int returns just the