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

feat(web/user_info/motto): markdown support

Browse Source
This commit is contained in:
Baoshuo Ren 2022-10-12 19:13:33 +08:00
parent 8579e31c19
commit 60ba1a5829
Signed by: baoshuo
GPG Key ID: 00CB9680AB29F51A
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/controllers/change_user_info.php
View File

@ -107,7 +107,7 @@
<label for="input-motto" class="col-sm-2 control-label"><?= UOJLocale::get('motto') ?></label> <label for="input-motto" class="col-sm-2 control-label"><?= UOJLocale::get('motto') ?></label>
<div class="col-sm-3"> <div class="col-sm-3">
<textarea class="form-control" id="input-motto" name="motto"><?=HTML::escape($myUser['motto'])?></textarea> <textarea class="form-control" id="input-motto" name="motto"><?=HTML::escape($myUser['motto'])?></textarea>
<span class="help-block" id="help-motto"></span> <span class="help-block" id="help-motto">格言支持 Markdown 语法。</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

2
web/app/controllers/user_info.php
View File

@ -59,7 +59,7 @@
</div> </div>
<div class="list-group-item"> <div class="list-group-item">
<h4 class="list-group-item-heading"><?= UOJLocale::get('motto') ?></h4> <h4 class="list-group-item-heading"><?= UOJLocale::get('motto') ?></h4>
<div class="list-group-item-text"><?= HTML::purifier_inline()->purify($user['motto']) ?></div> <div class="list-group-item-text"><?= HTML::purifier_inline()->purify(HTML::parsedown()->line($user['motto'])) ?></div>
</div> </div>
<?php if (isSuperUser($myUser)): ?> <?php if (isSuperUser($myUser)): ?>

5
web/app/libs/uoj-html-lib.php
View File

@ -1357,9 +1357,10 @@ function echoRanklist($config = array()) {
$header_row .= '<th style="width: 5em;">'.UOJLocale::get('solved').'</th>'; $header_row .= '<th style="width: 5em;">'.UOJLocale::get('solved').'</th>';
$header_row .= '</tr>'; $header_row .= '</tr>';
$parsedown = HTML::parsedown();
$purifier = HTML::purifier_inline(); $purifier = HTML::purifier_inline();
$users = array(); $users = array();
$print_row = function($user, $now_cnt) use (&$users, $config, $purifier) { $print_row = function($user, $now_cnt) use (&$users, $config, $purifier, $parsedown) {
if (!$users) { if (!$users) {
if ($now_cnt == 1) { if ($now_cnt == 1) {
$rank = 1; $rank = 1;
@ -1376,7 +1377,7 @@ function echoRanklist($config = array()) {
echo '<td>' . $user['rank'] . '</td>'; echo '<td>' . $user['rank'] . '</td>';
echo '<td>' . getUserLink($user['username']) . '</td>'; echo '<td>' . getUserLink($user['username']) . '</td>';
echo "<td>"; echo "<td>";
echo $purifier->purify($user['motto']); echo $purifier->purify($parsedown->line($user['motto']));
echo "</td>"; echo "</td>";
echo '<td>' . $user['ac_num'] . '</td>'; echo '<td>' . $user['ac_num'] . '</td>';
echo '</tr>'; echo '</tr>';

9
web/app/models/HTML.php
View File

@ -191,4 +191,13 @@ class HTML {
return new HTMLPurifier($config); return new HTMLPurifier($config);
} }
public static function parsedown() {
return new ParsedownMath([
'math' => [
'enabled' => true,
'matchSingleDollar' => true
]
]);
}
} }

7
web/app/models/UOJBlogEditor.php
View File

@ -102,12 +102,7 @@ class UOJBlogEditor {
$this->post_data['is_hidden'] = isset($_POST["{$this->name}_is_hidden"]) ? 1 : 0; $this->post_data['is_hidden'] = isset($_POST["{$this->name}_is_hidden"]) ? 1 : 0;
$purifier = HTML::purifier(); $purifier = HTML::purifier();
$parsedown = new ParsedownMath([ $parsedown = HTML::parsedown();
'math' => [
'enabled' => true,
'matchSingleDollar' => true
]
]);
$this->post_data['title'] = HTML::escape($this->post_data['title']); $this->post_data['title'] = HTML::escape($this->post_data['title']);

2
web/app/views/user-info.php
View File

@ -82,7 +82,7 @@ function fTime($time, $gran = -1) {
</span> </span>
</h3> </h3>
<div class="card-text"> <div class="card-text">
<?= HTML::purifier_inline()->purify($user['motto']) ?> <?= HTML::purifier_inline()->purify(HTML::parsedown()->line($user['motto'])) ?>
</div> </div>
</div> </div>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">