formatting pass

This commit is contained in:
Matthew Barbour 2020-06-02 17:47:53 -05:00 committed by Shish
parent 2bb5f349f9
commit bccb206369
4 changed files with 9 additions and 11 deletions

View file

@ -259,7 +259,6 @@ class BasePage
public function flush_output(): void
{
}
/**
@ -267,7 +266,7 @@ class BasePage
*/
public function display(): void
{
if($this->mode!=PageMode::MANUAL) {
if ($this->mode!=PageMode::MANUAL) {
$this->send_headers();
}

View file

@ -409,15 +409,15 @@ function remove_empty_dirs(string $dir): bool
),
['..', '.']
);
foreach($items as $item) {
foreach ($items as $item) {
$path = join_path($dir, $item);
if(is_dir($path)) {
if (is_dir($path)) {
$result = $result && remove_empty_dirs($path);
} else {
$result = false;
}
}
if($result===true) {
if ($result===true) {
$result = $result && rmdir($dir);
}
return $result;
@ -426,7 +426,6 @@ function remove_empty_dirs(string $dir): bool
function get_files_recursively(string $dir): array
{
assert(!empty($dir));
if (!is_dir($dir)) {
@ -443,9 +442,9 @@ function get_files_recursively(string $dir): array
$output = [];
foreach($things as $thing) {
$path = join_path($dir,$thing);
if(is_file($path)) {
foreach ($things as $thing) {
$path = join_path($dir, $thing);
if (is_file($path)) {
$output[] = $path;
} else {
$output = array_merge($output, get_files_recursively($path));

View file

@ -74,7 +74,7 @@ class CronUploaderTheme extends Themelet
<ul>
<li>If an import is already running, another cannot start until it is done.</li>
<li>Each time it runs it will import for up to ".number_format ($max_time)." seconds. This is controlled by the PHP max execution time.</li>
<li>Each time it runs it will import for up to ".number_format($max_time)." seconds. This is controlled by the PHP max execution time.</li>
<li>Uploaded images will be moved to the 'uploaded' directory into a subfolder named after the time the import started. It's recommended that you remove everything out of this directory from time to time. If you have admin controls enabled, this can be done from <a href='".make_link("admin")."'>Board Admin</a>.</li>
<li>If you enable the db logging extension, you can view the log output on this screen. Otherwise the log will be written to a file at ".CronUploaderConfig::get_dir().DIRECTORY_SEPARATOR."uploads.log</li>
</ul>

View file

@ -8,5 +8,5 @@ class TrashInfo extends ExtensionInfo
public $name = "Trash";
public $authors = ["Matthew Barbour"=>"matthew@darkholme.net"];
public $license = self::LICENSE_WTFPL;
public $description = "Provides \"Trash\" or \"Recycle Bin\"-type functionality, storing delete images for later recovery";
public $description = "Provides \"Trash\" or \"Recycle Bin\"-type functionality, storing deleted images for later recovery";
}