ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Post edit: post content can now be replaced

Browse source
This commit is contained in:
Marcin Kurczewski 2013-11-23 17:27:56 +01:00
parent ee224b84db
commit 3b532532d1
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controllers/PostController.php
View file

@ -572,7 +572,7 @@ class PostController
private function doEdit($post, $isNew)
{
/* file contents */
if (isset($_FILES['file']))
if (!empty($_FILES['file']['name']))
{
if (!$isNew)
PrivilegesHelper::confirmWithException(Privilege::EditPostFile, PrivilegesHelper::getIdentitySubPrivilege($post->uploader));

12
src/Models/Model_Post.php
View file

@ -267,7 +267,7 @@ class Model_Post extends AbstractModel
$this->orig_name = basename($srcPath);
$duplicatedPost = R::findOne('post', 'file_hash = ?', [$this->file_hash]);
if ($duplicatedPost !== null)
if ($duplicatedPost !== null and (!$this->id or $this->id != $duplicatedPost->id))
throw new SimpleException('Duplicate upload: @' . $duplicatedPost->id);
$dstPath = $this->getFullPath($this->name);
@ -276,6 +276,10 @@ class Model_Post extends AbstractModel
move_uploaded_file($srcPath, $dstPath);
else
rename($srcPath, $dstPath);
$thumbPath = self::getThumbDefaultPath($this->name);
if (file_exists($thumbPath))
unlink($thumbPath);
}
@ -298,8 +302,12 @@ class Model_Post extends AbstractModel
$this->image_width = null;
$this->image_height = null;
$thumbPath = self::getThumbDefaultPath($this->name);
if (file_exists($thumbPath))
unlink($thumbPath);
$duplicatedPost = R::findOne('post', 'orig_name = ?', [$origName]);
if ($duplicatedPost !== null)
if ($duplicatedPost !== null and (!$this->id or $this->id != $duplicatedPost->id))
throw new SimpleException('Duplicate upload: @' . $duplicatedPost->id);
return;
}

12
src/Views/post-edit.phtml
View file

@ -34,6 +34,18 @@
</div>
<?php endif ?>
<?php if (PrivilegesHelper::confirm(Privilege::EditPostFile, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->post->uploader))): ?>
<div class="url">
<label class="left" for="url">File:</label>
<div class="input-wrapper"><input type="text" name="url" id="url" placeholder="Some url&hellip;"/></div>
</div>
<div class="file">
<label class="left" for="file"></label>
<div class="input-wrapper"><input type="file" name="file" id="file"/></div>
</div>
<?php endif ?>
<?php if (PrivilegesHelper::confirm(Privilege::EditPostThumb, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->post->uploader))): ?>
<div class="thumb">
<label class="left" for="thumb">Thumb:</label>