1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-13 18:40:49 +01:00

tiny cleanup

This commit is contained in:
Michael Save 2012-05-19 20:46:05 +10:00
parent 970c6cd95b
commit 93c3ceb04d

View File

@ -741,7 +741,7 @@ function mod_move($originBoard, $postID) {
// create the new thread // create the new thread
$newID = post($post); $newID = post($post);
if($post['has_file']) { if ($post['has_file']) {
// copy image // copy image
$clone($file_src, sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file']); $clone($file_src, sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file']);
$clone($file_thumb, sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb']); $clone($file_thumb, sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb']);
@ -756,11 +756,11 @@ function mod_move($originBoard, $postID) {
$replies = array(); $replies = array();
while($post = $query->fetch()) { while ($post = $query->fetch()) {
$post['mod'] = true; $post['mod'] = true;
$post['thread'] = $newID; $post['thread'] = $newID;
if($post['file']) { if ($post['file']) {
$post['has_file'] = true; $post['has_file'] = true;
$post['width'] = &$post['filewidth']; $post['width'] = &$post['filewidth'];
$post['height'] = &$post['fileheight']; $post['height'] = &$post['fileheight'];
@ -778,15 +778,15 @@ function mod_move($originBoard, $postID) {
openBoard($targetBoard); openBoard($targetBoard);
foreach($replies as &$post) { foreach ($replies as &$post) {
$query = prepare('SELECT `target` FROM `cites` WHERE `target_board` = :board AND `board` = :board AND `post` = :post'); $query = prepare('SELECT `target` FROM `cites` WHERE `target_board` = :board AND `board` = :board AND `post` = :post');
$query->bindValue(':board', $originBoard); $query->bindValue(':board', $originBoard);
$query->bindValue(':post', $post['id'], PDO::PARAM_INT); $query->bindValue(':post', $post['id'], PDO::PARAM_INT);
$query->execute() or error(db_error($qurey)); $query->execute() or error(db_error($qurey));
// correct >>X links // correct >>X links
while($cite = $query->fetch(PDO::FETCH_ASSOC)) { while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
if(isset($newIDs[$cite['target']])) { if (isset($newIDs[$cite['target']])) {
$post['body_nomarkup'] = preg_replace( $post['body_nomarkup'] = preg_replace(
'/(>>(>\/' . preg_quote($originBoard, '/') . '\/)?)' . preg_quote($cite['target'], '/') . '/', '/(>>(>\/' . preg_quote($originBoard, '/') . '\/)?)' . preg_quote($cite['target'], '/') . '/',
'>>' . $newIDs[$cite['target']], '>>' . $newIDs[$cite['target']],
@ -804,13 +804,13 @@ function mod_move($originBoard, $postID) {
// insert reply // insert reply
$newIDs[$post['id']] = $newPostID = post($post); $newIDs[$post['id']] = $newPostID = post($post);
if($post['has_file']) { if ($post['has_file']) {
// copy image // copy image
$clone($post['file_src'], sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file']); $clone($post['file_src'], sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file']);
$clone($post['file_thumb'], sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb']); $clone($post['file_thumb'], sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb']);
} }
foreach($post['tracked_cites'] as $cite) { foreach ($post['tracked_cites'] as $cite) {
$query = prepare('INSERT INTO `cites` VALUES (:board, :post, :target_board, :target)'); $query = prepare('INSERT INTO `cites` VALUES (:board, :post, :target_board, :target)');
$query->bindValue(':board', $board['uri']); $query->bindValue(':board', $board['uri']);
$query->bindValue(':post', $newPostID, PDO::PARAM_INT); $query->bindValue(':post', $newPostID, PDO::PARAM_INT);
@ -830,7 +830,7 @@ function mod_move($originBoard, $postID) {
// return to original board // return to original board
openBoard($originBoard); openBoard($originBoard);
if($shadow) { if ($shadow) {
// lock old thread // lock old thread
$query = prepare(sprintf('UPDATE `posts_%s` SET `locked` = 1 WHERE `id` = :id', $originBoard)); $query = prepare(sprintf('UPDATE `posts_%s` SET `locked` = 1 WHERE `id` = :id', $originBoard));
$query->bindValue(':id', $postID, PDO::PARAM_INT); $query->bindValue(':id', $postID, PDO::PARAM_INT);