|
|
@ -1237,8 +1237,10 @@ function mod_move_reply($originBoard, $postID) { |
|
|
|
$post['files'] = json_decode($post['files'], TRUE); |
|
|
|
$post['has_file'] = true; |
|
|
|
foreach ($post['files'] as $i => &$file) { |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
if ($file['file'] !== 'deleted') |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
if (isset($file['thumb']) && !in_array($file['thumb'], array('spoiler', 'deleted', 'file'))) |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
} |
|
|
|
} else { |
|
|
|
$post['has_file'] = false; |
|
|
@ -1256,8 +1258,9 @@ function mod_move_reply($originBoard, $postID) { |
|
|
|
if ($post['has_file']) { |
|
|
|
foreach ($post['files'] as $i => &$file) { |
|
|
|
// move the image |
|
|
|
rename($file['file_path'], sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']); |
|
|
|
if ($file['thumb'] != 'spoiler') { //trying to move/copy the spoiler thumb raises an error |
|
|
|
if ($file['file'] !== 'deleted') |
|
|
|
rename($file['file_path'], sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']); |
|
|
|
if (isset($file['thumb']) && !in_array($file['thumb'], array('spoiler', 'deleted', 'file'))){ |
|
|
|
rename($file['thumb_path'], sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']); |
|
|
|
} |
|
|
|
} |
|
|
@ -1337,10 +1340,10 @@ function mod_move($originBoard, $postID) { |
|
|
|
$post['files'] = json_decode($post['files'], TRUE); |
|
|
|
$post['has_file'] = true; |
|
|
|
foreach ($post['files'] as $i => &$file) { |
|
|
|
if ($file['file'] === 'deleted') |
|
|
|
continue; |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
if ($file['file'] !== 'deleted') |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
if (isset($file['thumb']) && !in_array($file['thumb'], array('spoiler', 'deleted', 'file'))) |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
} |
|
|
|
} else { |
|
|
|
$post['has_file'] = false; |
|
|
@ -1600,10 +1603,10 @@ function mod_merge($originBoard, $postID) { |
|
|
|
$post['files'] = json_decode($post['files'], TRUE); |
|
|
|
$post['has_file'] = true; |
|
|
|
foreach ($post['files'] as $i => &$file) { |
|
|
|
if ($file['file'] === 'deleted') |
|
|
|
continue; |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
if ($file['file'] !== 'deleted') |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
if (isset($file['thumb']) && !in_array($file['thumb'], array('spoiler', 'deleted', 'file'))) |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
} |
|
|
|
} else { |
|
|
|
$post['has_file'] = false; |
|
|
@ -1650,8 +1653,10 @@ function mod_merge($originBoard, $postID) { |
|
|
|
$post['files'] = json_decode($post['files'], TRUE); |
|
|
|
$post['has_file'] = true; |
|
|
|
foreach ($post['files'] as $i => &$file) { |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
if ($file['file'] !== 'deleted') |
|
|
|
$file['file_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']; |
|
|
|
if (isset($file['thumb']) && !in_array($file['thumb'], array('spoiler', 'deleted', 'file'))) |
|
|
|
$file['thumb_path'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']; |
|
|
|
} |
|
|
|
} else { |
|
|
|
$post['has_file'] = false; |
|
|
@ -1690,8 +1695,10 @@ function mod_merge($originBoard, $postID) { |
|
|
|
if ($post['has_file']) { |
|
|
|
// copy image |
|
|
|
foreach ($post['files'] as $i => &$file) { |
|
|
|
clone_wrapped_with_exist_check($clone, $file['file_path'], sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']); |
|
|
|
clone_wrapped_with_exist_check($clone, $file['thumb_path'], sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']); |
|
|
|
if ($file['file'] !== 'deleted') |
|
|
|
clone_wrapped_with_exist_check($clone, $file['file_path'], sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $file['file']); |
|
|
|
if (isset($file['thumb']) && !in_array($file['thumb'], array('spoiler', 'deleted', 'file'))) |
|
|
|
clone_wrapped_with_exist_check($clone, $file['thumb_path'], sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $file['thumb']); |
|
|
|
} |
|
|
|
} |
|
|
|
// insert reply |
|
|
|