baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-22 03:48:41 +00:00
Code Issues Actions Packages Releases Activity

fix(blog): fix incorrect blog links from writing page (#38)

Browse Source 
When a blogs was saved, only links of form "/blog/id/write" was
returned, ignoring username. Under a subdomain
("user.blog.site/blog/id/write") this is fine, but it does not work if
a subdomain is not used ("site/blog/id/write"). `HTML::blog_url` should
be called to return the links.

Also, DB::insert_id is called before actually inserting the blogs to get
the new blog's id. This sometimes return a 0, especially when the user
has just deleted a blog. DB::insert_id should be called after the
insert instead.
This commit is contained in:
TRCYX 2019-04-26 00:07:47 +08:00 committed by Masco Skray
parent e0914a8f31
commit a8cec5a42f
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
uoj/1/app/controllers/subdomain/blog/blog_write.php
View File

@ -55,20 +55,18 @@
deleteBlog($blog['id']); deleteBlog($blog['id']);
insertBlog(array_merge($data, array('is_draft' => 0))); insertBlog(array_merge($data, array('is_draft' => 0)));
$blog = array('id' => DB::insert_id(), 'tags' => array()); $blog = array('id' => DB::insert_id(), 'tags' => array());
$ret['blog_write_url'] = "/blog/{$blog['id']}/write"; $ret['blog_write_url'] = HTML::blog_url(UOJContext::user()['username'], "/blog/{$blog['id']}/write");
$ret['blog_url'] = "/blog/{$blog['id']}"; $ret['blog_url'] = HTML::blog_url(UOJContext::user()['username'], "/blog/{$blog['id']}");
} }
} else { } else {
updateBlog($blog['id'], $data); updateBlog($blog['id'], $data);
} }
} else { } else {
insertBlog(array_merge($data, array('is_draft' => $data['is_hidden'] ? 1 : 0)));
$blog = array('id' => DB::insert_id(), 'tags' => array()); $blog = array('id' => DB::insert_id(), 'tags' => array());
if ($data['is_hidden']) { if (!$data['is_hidden']) {
insertBlog(array_merge($data, array('is_draft' => 1))); $ret['blog_write_url'] = HTML::blog_url(UOJContext::user()['username'], "/blog/{$blog['id']}/write");
} else { $ret['blog_url'] = HTML::blog_url(UOJContext::user()['username'], "/blog/{$blog['id']}");
insertBlog(array_merge($data, array('is_draft' => 0)));
$ret['blog_write_url'] = "/blog/{$blog['id']}/write";
$ret['blog_url'] = "/blog/{$blog['id']}";
} }
} }
if ($data['tags'] !== $blog['tags']) { if ($data['tags'] !== $blog['tags']) {

10
uoj/1/app/controllers/subdomain/blog/slide_write.php
View File

@ -56,19 +56,15 @@
deleteBlog($blog['id']); deleteBlog($blog['id']);
insertSlide(array_merge($data, array('is_draft' => 0))); insertSlide(array_merge($data, array('is_draft' => 0)));
$blog = array('id' => DB::insert_id(), 'tags' => array()); $blog = array('id' => DB::insert_id(), 'tags' => array());
$ret['blog_write_url'] = "/slide/{$blog['id']}/write"; $ret['blog_write_url'] = HTML::blog_url(UOJContext::user()['username'], "/slide/{$blog['id']}/write");
$ret['blog_url'] = "/blog/{$blog['id']}"; $ret['blog_url'] = HTML::blog_url(UOJContext::user()['username'], "/blog/{$blog['id']}");
} }
} else { } else {
updateBlog($blog['id'], $data); updateBlog($blog['id'], $data);
} }
} else { } else {
insertSlide(array_merge($data, array('is_draft' => $data['is_hidden'] ? 1 : 0)));
$blog = array('id' => DB::insert_id(), 'tags' => array()); $blog = array('id' => DB::insert_id(), 'tags' => array());
if ($data['is_hidden']) {
insertSlide(array_merge($data, array('is_draft' => 1)));
} else {
insertSlide(array_merge($data, array('is_draft' => 0)));
}
} }
if ($data['tags'] !== $blog['tags']) { if ($data['tags'] !== $blog['tags']) {
DB::delete("delete from blogs_tags where blog_id = {$blog['id']}"); DB::delete("delete from blogs_tags where blog_id = {$blog['id']}");