james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more hinting

Browse Source
This commit is contained in:
Shish 2016-07-30 22:54:42 +01:00
parent b81e8a2db8
commit ffce1a4683
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ext/upload/main.php
View File

@ -157,7 +157,7 @@ class Upload extends Extension {
} }
$source = isset($_POST['source']) ? $_POST['source'] : null; $source = isset($_POST['source']) ? $_POST['source'] : null;
$tags = ''; // Tags aren't changed when uploading. Set to null to stop PHP warnings. $tags = array(); // Tags aren't changed when replacing. Set to empty to stop PHP warnings.
$ok = false; $ok = false;
if(count($_FILES)) { if(count($_FILES)) {
@ -287,14 +287,18 @@ class Upload extends Extension {
/** /**
* Handle an upload. * Handle an upload.
* @param $file * @param string $file
* @param $tags * @param string[] $tags
* @param $source * @param string|null $source
* @param string $replace * @param int $replace
* @return bool TRUE on upload successful. * @return bool TRUE on upload successful.
*/ */
private function try_upload($file, $tags, $source, $replace='') { private function try_upload($file, $tags, $source, $replace=-1) {
global $page; global $page;
assert('is_string($url)');
assert('is_array($tags)');
assert('is_string($source) || is_null($source)');
assert('is_int($replace)');
if(empty($source)) $source = null; if(empty($source)) $source = null;
@ -316,7 +320,7 @@ class Upload extends Extension {
$metadata['source'] = $source; $metadata['source'] = $source;
/* check if we have been given an image ID to replace */ /* check if we have been given an image ID to replace */
if (!empty($replace)) { if ($replace >= 0) {
$metadata['replace'] = $replace; $metadata['replace'] = $replace;
} }
@ -341,13 +345,17 @@ class Upload extends Extension {
* Handle an transload. * Handle an transload.
* *
* @param string $url * @param string $url
* @param mixed $tags * @param string[] $tags
* @param string $source * @param string|null $source
* @param string $replace * @param int $replace
* @return bool Returns TRUE on transload successful. * @return bool Returns TRUE on transload successful.
*/ */
private function try_transload($url, $tags, $source, $replace='') { private function try_transload($url, $tags, $source, $replace=-1) {
global $page, $config, $user; global $page, $config, $user;
assert('is_string($url)');
assert('is_array($tags)');
assert('is_string($source) || is_null($source)');
assert('is_int($replace)');
$ok = true; $ok = true;
@ -408,7 +416,7 @@ class Upload extends Extension {
} }
/* check if we have been given an image ID to replace */ /* check if we have been given an image ID to replace */
if (!empty($replace)) { if ($replace >= 0) {
$metadata['replace'] = $replace; $metadata['replace'] = $replace;
} }