Compare commits

...

No commits in common. "master" and "bug209-yaaqob" have entirely different histories.

4 changed files with 57 additions and 44 deletions

View File

@ -5,10 +5,6 @@ from UseSqlite import InsertQuery, RecordQuery
path_prefix = '/var/www/wordfreq/wordfreq/' path_prefix = '/var/www/wordfreq/wordfreq/'
path_prefix = './' # comment this line in deployment path_prefix = './' # comment this line in deployment
def verify_pass(newpass,oldpass):
if(newpass==oldpass):
return True
def verify_user(username, password): def verify_user(username, password):
rq = RecordQuery(path_prefix + 'static/wordfreqapp.db') rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
@ -51,8 +47,6 @@ def change_password(username, old_password, new_password):
if not verify_user(username, old_password): # 旧密码错误 if not verify_user(username, old_password): # 旧密码错误
return False return False
# 将用户名和密码一起加密,以免暴露不同用户的相同密码 # 将用户名和密码一起加密,以免暴露不同用户的相同密码
if verify_pass(new_password,old_password): #新旧密码一致
return False
password = md5(username + new_password) password = md5(username + new_password)
rq = InsertQuery(path_prefix + 'static/wordfreqapp.db') rq = InsertQuery(path_prefix + 'static/wordfreqapp.db')
rq.instructions_with_parameters("UPDATE user SET password=:password WHERE name=:username", dict( rq.instructions_with_parameters("UPDATE user SET password=:password WHERE name=:username", dict(

View File

@ -1,45 +1,64 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" /> <meta
name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes"
/>
<meta name="format-detection" content="telephone=no" /> <meta name="format-detection" content="telephone=no" />
{{ yml['header'] | safe }} {{ yml['header'] | safe }} {% if yml['css']['item'] %} {% for css in
{% if yml['css']['item'] %} yml['css']['item'] %}
{% for css in yml['css']['item'] %} <link href="{{ css }}" rel="stylesheet" />
<link href="{{ css }}" rel="stylesheet"> {% endfor %} {% endif %} {% if yml['js']['head'] %} {% for js in
{% endfor %} yml['js']['head'] %}
{% endif %} <script src="{{ js }}"></script>
{% if yml['js']['head'] %} {% endfor %} {% endif %}
{% for js in yml['js']['head'] %}
<script src="{{ js }}" ></script>
{% endfor %}
{% endif %}
<title>EnglishPal Study Room for {{username}}</title> <title>EnglishPal Study Room for {{username}}</title>
</head> </head>
<body> <body>
<p>勾选不认识的单词</p> <p>勾选不认识的单词</p>
<form method="post" action="/{{username}}/mark"> <form method="post" action="/{{username}}/mark">
<input type="submit" name="add-btn" value="加入我的生词簿"/> <input type="submit" name="add-btn" value="加入我的生词簿" />
{% for x in lst %} <input
{% set word = x[0]%} onclick="checkall()"
type="button"
name="add-btn"
value="select all"
/>
{% for x in lst %} {% set word = x[0]%}
<p> <p>
<font color="grey">{{loop.index}}</font> <font color="grey">{{loop.index}}</font>
: :
<a href='http://youdao.com/w/eng/{{word}}/#keyfrom=dict2.index' title={{word}}>{{word}}</a> <a
href="http://youdao.com/w/eng/{{word}}/#keyfrom=dict2.index"
title="{{word}}"
>{{word}}</a
>
({{x[1]}}) ({{x[1]}})
<input type="checkbox" name="marked" value={{word}}> <input
class="select-all"
type="checkbox"
name="marked"
value="{{word}}"
/>
</p> </p>
{% endfor %} {% endfor %}
</form> </form>
{{ yml['footer'] | safe }} {{ yml['footer'] | safe }} {% if yml['js']['bottom'] %} {% for js in
{% if yml['js']['bottom'] %} yml['js']['bottom'] %}
{% for js in yml['js']['bottom'] %} <script src="{{ js }}"></script>
<script src="{{ js }}" ></script> <script>
{% endfor %} function checkall() {
{% endif %} const selectAllCheckBox = document.querySelectorAll(".select-all");
</body> for (let i = 0; i < selectAllCheckBox.length; i++) {
selectAllCheckBox[i].checked = true;
}
}
</script>
{% endfor %} {% endif %}
</body>
</html> </html>

0
build.sh Executable file → Normal file
View File

BIN
wordfreqapp.db Normal file

Binary file not shown.